diff --git a/Discussion_AD_DS_20250225.dat b/Discussion_AD_DS_20250225.dat
new file mode 100644
index 0000000000..6f06a2d10b
--- /dev/null
+++ b/Discussion_AD_DS_20250225.dat
@@ -0,0 +1,40 @@
+
+
+-----------------------
+OVERALL philosophy
+-----------------------
+
+- dedicated subroutines which interfaces lapack or magma (single and double precision version), and serial or parallel (?)
+  
+  SERIAL_HERMITIAN_diagonalization            --> could be renamed HEEV
+  SERIAL_diagonalization (non hermitian case) --> could be renamed GEEV ?
+  SERIAL_inversion
+  SERIAL_SVD_inversion
+  SERIAL_lin_system (to be merge also with SERIAL_lin_system_gpu)
+  
+  PARALLEL_HERMITIAN_diagonalization            --> could be merged with SERIAL_HERMITIAN_diagonalization 
+  PARALLEL_diagonalization (non hermitian case) --> could be merged with SERIAL_diagonalization
+
+  PARALLEL_MbyM could be created (for now it does not exist)
+
+  The kind of operation could be managed via an handle, however the sobroutines must be cleaned by all extra operations, e.g.
+  allocation, parallel setup, etc ... which should be shifted inside LINEAR_ALGEBRA_init or similar subroutine
+
+  LINEAR_ALGEBRA_driver is never directly called, but the above subroutines are directly called. It only performs initializations
+
+
+-----------------------
+DONE
+-----------------------
+
+- compilation to be fixed
+
+- To be removed:
+    M_eigenvalues, heev and geev interfaces 
+
+- mod_wrapper --> wrapper yambo for single and double to blas --> when available calls devxlib single and double subroutines
+
+- mod_linear algebra has wrappers single and double to few selected lapack
+  --> LU_factorization
+  --> SV_decomposition
+
diff --git a/config/configure.ac b/config/configure.ac
index b12941d225..310eda0d37 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -254,6 +254,7 @@ m4_include([config/m4/iotk.m4])
 m4_include([config/m4/etsf_io.m4])
 m4_include([config/m4/scalapack.m4])
 m4_include([config/m4/petsc_slepc.m4])
+m4_include([config/m4/magma.m4])
 m4_include([config/m4/libcuda.m4])
 m4_include([config/m4/device_xlib.m4])
 #
@@ -305,6 +306,9 @@ AC_SET_GPU
 # Device XLIB
 ACX_DEVXLIB
 # ============================================================================
+# MAGMA
+AC_MAGMA_SETUP
+# ============================================================================
 # Prepare the REPORT file variables
 ACX_REPORT()
 # ============================================================================
diff --git a/config/m4/acx_report.m4 b/config/m4/acx_report.m4
index 7dcd164b21..d5a59c7b85 100644
--- a/config/m4/acx_report.m4
+++ b/config/m4/acx_report.m4
@@ -141,6 +141,14 @@ if test "$internal_libxc" = "yes" ; then
   if test "$compile_libxc" = "no" ; then LIBXC_check="I"; fi
 fi
 #
+MAGMA_check="-"
+if test "$internal_magma" = "yes" ; then
+  if test "$compile_magma" = "yes" ; then MAGMA_check="C"; fi
+  if test "$compile_magma" = "no"  ; then MAGMA_check="I"; fi
+elif test "$enable_magma" = "yes" ; then
+  MAGMA_check="E"
+fi
+#
 DEVXLIB_check="E"
 if test "$internal_devxlib" = "yes" ; then
   if test "$compile_devxlib" = "yes"; then DEVXLIB_check="C"; fi
@@ -229,6 +237,7 @@ AC_SUBST(YDB_check)
 AC_SUBST(YPY_check)
 #
 AC_SUBST(LIBXC_check)
+AC_SUBST(MAGMA_check)
 AC_SUBST(DEVXLIB_check)
 AC_SUBST(LIBCUDA_check)
 AC_SUBST(MPI_check)
@@ -313,6 +322,13 @@ SCALAPACK_INCS_R=$STRIPE
 AC_SUBST(SCALAPACK_LIBS_R)
 AC_SUBST(SCALAPACK_INCS_R)
 #
+ACX_STRIPE_SUBPATH($MAGMA_LIBS,"LIB")
+MAGMA_LIBS_R=$STRIPE
+ACX_STRIPE_SUBPATH($MAGMA_INCS,"INC")
+MAGMA_INCS_R=$STRIPE
+AC_SUBST(MAGMA_LIBS_R)
+AC_SUBST(MAGMA_INCS_R)
+#
 ACX_STRIPE_SUBPATH($BLACS_LIBS,"LIB")
 BLACS_LIBS_R=$STRIPE
 ACX_STRIPE_SUBPATH($BLACS_INCS,"INC")
@@ -334,6 +350,13 @@ SLEPC_INCS_R=$STRIPE
 AC_SUBST(SLEPC_LIBS_R)
 AC_SUBST(SLEPC_INCS_R)
 #
+ACX_STRIPE_SUBPATH($MAGMA_LIBS,"LIB")
+MAGMA_LIBS_R=$STRIPE
+ACX_STRIPE_SUBPATH($MAGMA_INCS,"INC")
+MAGMA_INCS_R=$STRIPE
+AC_SUBST(MAGMA_LIBS_R)
+AC_SUBST(MAGMA_INCS_R)
+#
 ACX_STRIPE_SUBPATH($LIBXC_LIBS,"LIB")
 LIBXC_LIBS_R=$STRIPE
 ACX_STRIPE_SUBPATH($LIBXC_INCS,"INC")
diff --git a/config/m4/gpu.m4 b/config/m4/gpu.m4
index 2338bc7388..2e8f32d2b8 100644
--- a/config/m4/gpu.m4
+++ b/config/m4/gpu.m4
@@ -127,7 +127,7 @@ AC_ARG_WITH(rocm_path, [AS_HELP_STRING([--with-rocm-path=<path>],
             [Path to rocm install directory],[32])])
 #
 AC_ARG_WITH(mklgpu_libs, [AS_HELP_STRING([--with-mklgpu-libs=<libs>], 
-            [Use librocm library <libs>],[32])])
+            [Use the MKLGPU library <libs>],[32])])
 
 use_int_cuda_libs="no"
 use_gpu_libs="no"
diff --git a/config/m4/magma.m4 b/config/m4/magma.m4
new file mode 100644
index 0000000000..7628bb25a8
--- /dev/null
+++ b/config/m4/magma.m4
@@ -0,0 +1,210 @@
+#
+#        Copyright (C) 2000-2022 the YAMBO team
+#              http://www.yambo-code.org
+#
+# Authors (see AUTHORS file for details): AM
+#
+# This file is distributed under the terms of the GNU
+# General Public License. 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, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330,Boston,
+# MA 02111-1307, USA or visit http://www.gnu.org/copyleft/gpl.txt.
+#
+AC_DEFUN([AC_MAGMA_SETUP],[
+#
+AC_ARG_ENABLE(magma,   AS_HELP_STRING([--enable-magma],[Enable suport for the BSE diagonalization using MAGMA. Default is no]))
+#
+AC_ARG_WITH(magma_libs,AS_HELP_STRING([--with-magma-libs=<libs>],[Use Magma libraries <libs>],[32]))
+AC_ARG_WITH(magma_incs,AS_HELP_STRING([--with-magma-incs=<incs>],[Use Magma includes <incs>],[32]))
+AC_ARG_WITH(magma_path, AS_HELP_STRING([--with-magma-path=<path>],[Path to the Magma install directory],[32]),[],[])
+AC_ARG_WITH(magma_libdir,AS_HELP_STRING([--with-magma-libdir=<path>],[Path to the Magma lib directory],[32]))
+AC_ARG_WITH(magma_includedir,AS_HELP_STRING([--with-magma-includedir=<path>],[Path to the Magma include directory],[32]))
+
+#
+def_magma=""
+magma="no"
+internal_magma="no"
+compile_magma="no"
+compile_magma_fmodules="no"
+#
+if test x"$enable_magma" = "x"; then enable_magma="no" ; fi
+#if test x"$enable_magma" = "xyes"; then enable_magma="yes"; fi
+#
+# MAGMA global options
+#
+if test  x"$with_magma_libs" = "xyes" ; then
+  enable_magma="yes" ;
+  compile_magma_fmodules="yes" ;
+  with_magma_libs="";
+elif test  x"$with_magma_libs" = "xno" ; then
+  enable_magma="no" ;
+  compile_magma_fmodules="no" ;
+  with_magma_libs="";
+fi
+#
+if test  x"$with_magma_libdir" != "x" ; then enable_magma="yes" ; fi
+if test  x"$with_magma_path"   != "x" ; then enable_magma="yes" ; fi
+if test  x"$with_magma_libs"   != "x" ; then enable_magma="yes" ; fi
+#
+# Set MAGMA LIBS and FLAGS from INPUT
+#
+if test -d "$with_magma_path" || test -d "$with_magma_libdir" || test x"$with_magma_libs" != "x" ; then
+  #
+  # external magma
+  #
+  if   test   x"$with_magma_libs" != "x" ; then  AC_MSG_CHECKING([for Magma using $with_magma_libs]) ;
+  elif test -d "$with_magma_libdir"      ; then  AC_MSG_CHECKING([for Magma in $with_magma_libdir]) ;
+  elif test -d "$with_magma_path"        ; then  AC_MSG_CHECKING([for Magma in $with_magma_path/lib]) ;
+  fi
+  #
+  if test -d "$with_magma_path" ; then 
+      try_magma_libdir="$with_magma_path/lib" ;
+      try_magma_incdir="$with_magma_path/include" ;
+  fi
+  #
+  if test -d "$with_magma_libdir"     ; then try_magma_libdir="$with_magma_libdir" ; fi
+  if test -d "$with_magma_includedir" ; then try_magma_incdir="$with_magma_includedir" ; fi
+  #
+  try_MAGMA_INCS="$IFLAG$try_magma_incdir" ;
+  try_MAGMA_LIBS="-L$try_magma_libdir -lmagma" ;
+  #
+  if test x"$with_magma_libs" != "x" ; then try_MAGMA_LIBS="$with_magma_libs" ; fi
+  if test x"$with_magma_incs" != "x" ; then try_MAGMA_INCS="$with_magma_incs" ; fi
+  #
+  if test -z "$try_MAGMA_LIBS" ; then AC_MSG_ERROR([No libs specified]) ; fi
+  if test -z "$try_MAGMA_INCS" ; then AC_MSG_ERROR([No include-dir specified]) ; fi
+  #
+  AC_LANG([Fortran])
+  #
+  save_fcflags="$FCFLAGS" ;
+  save_libs="$LIBS" ;
+  #
+  FCFLAGS="$try_MAGMA_INCS $save_fcflags";
+  LIBS="$try_MAGMA_LIBS $save_libs";
+  #
+  # check for magma with fortran-interfaces
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [
+    use magma
+    implicit none
+    integer :: lda
+    !magma_devptr_t :: dA]),
+       [magmaf=yes], [magmaf=no]);
+  #
+  # check for c-style magma
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [
+    ierr = magma_init(); ]),
+       [magmac=yes], [magmac=no]);
+  #
+  AC_MSG_RESULT([Library: $magmac;  Fortran support: $magmaf]) ;
+  #
+  if test "x$magmaf" = "xyes"; then
+    #
+    MAGMA_INCS="$try_MAGMA_INCS" ;
+    MAGMA_LIBS="$try_MAGMA_LIBS" ;
+    magma=yes;
+    compile_magma="no";
+    internal_magma="no";
+    def_magma="-D_MAGMA"
+    #
+  elif test "x$magmac" = "xyes"; then
+    #
+    MAGMA_LIBS="$try_MAGMA_LIBS" ;
+    MAGMA_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include" ; 
+    magma=yes;
+    compile_magma="no";
+    compile_magma_fmodules="yes";
+    def_magma="-D_MAGMA"
+    #
+  else
+    #
+    magma=no;
+    #
+  fi
+  # 
+  FCFLAGS="$save_fcflags" ;
+  LIBS="$save_libs" ;
+  # 
+fi
+#
+# TO BE FIXED: needs internal compilation support and paths 
+#              have to be corrected with GPU_SUPPORT folder
+#
+# Internal compilation
+#
+if test "x$enable_magma" = "xyes" && test "x$magma" = "xno" ; then
+  #
+  # internal magma
+  #
+  AC_MSG_CHECKING([for internal Magma library])
+  #
+  internal_magma="yes"
+  #
+  #if test "x$lapack_shared" = "x1" ; then
+  #  MAGMA_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.so" ;
+  #  #MAGMA_LIBS="" ;
+  #else
+    MAGMA_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.a" ;
+  #fi
+  MAGMA_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include" ;
+  #
+  magma=yes
+  def_magma="-D_MAGMA"
+  if test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.a" ; then
+    compile_magma="no" ;
+    compile_magma_fmodules="no" ;
+    AC_MSG_RESULT([already compiled]) ;
+  elif test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.so" ; then
+    compile_magma="no" ;
+    compile_magma_fmodules="no" ;
+    AC_MSG_RESULT([already compiled]) ;
+  else
+    compile_magma="yes" ;
+    compile_magma_fmodules="no" ;
+    #
+    NVIDIA_ARCH=
+    if test "x$with_cuda_cc" != "x" ; then
+       if test "$with_cuda_cc" -ge 60 &&  ! test "$with_cuda_cc" -ge 70 ; then NVIDIA_ARCH=Pascal ; fi
+       if test "$with_cuda_cc" -ge 70 &&  ! test "$with_cuda_cc" -ge 80 ; then NVIDIA_ARCH=Volta ; fi
+       if test "$with_cuda_cc" -ge 80 &&  ! test "$with_cuda_cc" -ge 90 ; then NVIDIA_ARCH=Hopper ; fi
+    fi
+    #
+    AC_MSG_RESULT([Compatible external Magma not found/specified. To be compiled.]) ;
+    AC_SUBST(NVIDIA_ARCH)
+    AC_CONFIG_FILES([lib/magma/make_magma.inc:lib/magma/make_magma.inc.in])
+  fi
+  #
+fi
+
+#
+# switch off internal magma compilation
+#
+deactivate_internal=no
+if test "x$compile_magma" = "xyes" && test "x$internal_magma" = "xyes" && test "x$deactivate_internal" = "xyes"  ; then
+  AC_MSG_RESULT([Internal Magma compilation not available yet. Deactivating it.]) ;
+  compile_magma="no"
+  def_magma=""
+  enable_magma="no"
+  MAGMA_INCS="" ;
+  MAGMA_LIBS="" ;
+fi
+#
+AC_SUBST(MAGMA_LIBS)
+AC_SUBST(MAGMA_INCS)
+AC_SUBST(def_magma)
+AC_SUBST(enable_magma)
+AC_SUBST(compile_magma)
+AC_SUBST(compile_magma_fmodules)
+AC_SUBST(internal_magma)
+#
+])
diff --git a/config/mk/global/actions/compile_external_libraries.mk b/config/mk/global/actions/compile_external_libraries.mk
index 5162d67c71..5cc19b8021 100644
--- a/config/mk/global/actions/compile_external_libraries.mk
+++ b/config/mk/global/actions/compile_external_libraries.mk
@@ -39,6 +39,8 @@ blacs: scalapack
 	@if test "$(do_blacs)" = yes ; then LIBS="blacs" ; BASE="lib"; $(MAKE) $(MAKEFLAGS) blacs-dl; $(mk_external_lib); fi
 scalapack: lapack
 	@if test "$(do_slk)" = yes ; then LIBS="scalapack" ; BASE="lib"; $(MAKE) $(MAKEFLAGS) scalapack-dl ; $(mk_external_lib); fi
+magma: lapack
+	@if test "$(do_magma)" = yes ; then LIBS="magma" ; BASE="lib"; $(MAKE) $(MAKEFLAGS) magma-dl ; $(mk_external_lib); fi
 petsc:
 	@if test "$(do_petsc)" = yes ; then LIBS="petsc" ; BASE="lib"; $(MAKE) $(MAKEFLAGS) petsc-dl; $(mk_external_lib); fi
 slepc: petsc
diff --git a/config/mk/global/actions/compile_internal_libraries.mk b/config/mk/global/actions/compile_internal_libraries.mk
index 7a6e35f5a4..7b7276411a 100644
--- a/config/mk/global/actions/compile_internal_libraries.mk
+++ b/config/mk/global/actions/compile_internal_libraries.mk
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2020 The Yambo Team
 #
-# Authors (see AUTHORS file for details): AM
+# Authors (see AUTHORS file for details): AM DS
 #
 qe_pseudo: 
 	@+LIBS="qe_pseudo"; BASE="lib" ; ADF="$(STAMP_DBLE)"; LAB=""; $(todo_lib); $(mk_lib)
@@ -13,3 +13,5 @@ math77:
 	@+LIBS="math77";    BASE="lib" ; ADF="$(STAMP_DBLE)"; LAB=""; $(todo_lib); $(mk_lib)
 local: 
 	@+LIBS="local" ;    BASE="lib" ; ADF="$(STAMP_DBLE)"; LAB=""; $(todo_lib); $(mk_lib)
+magma_fmodules: 
+	@+LIBS="magma_fmodules"; BASE="lib" ; ADF="$(STAMP_DBLE)"; LAB=""; $(todo_lib); $(mk_lib)
diff --git a/config/mk/global/actions/download_external_libraries.mk b/config/mk/global/actions/download_external_libraries.mk
index 9551f740e6..d55f4c5032 100644
--- a/config/mk/global/actions/download_external_libraries.mk
+++ b/config/mk/global/actions/download_external_libraries.mk
@@ -35,6 +35,8 @@ blacs-dl:
 	@LIB2DO="blacs"; $(get_external_libraries)
 scalapack-dl: 
 	@LIB2DO="scalapack"; $(get_external_libraries)
+magma-dl: 
+	@LIB2DO="magma"; $(get_external_libraries)
 petsc-dl: 
 	@LIB2DO="petsc"; $(get_external_libraries)
 slepc-dl: 
diff --git a/config/mk/global/defs.mk.in b/config/mk/global/defs.mk.in
index ffd366f36c..573bacb4d6 100644
--- a/config/mk/global/defs.mk.in
+++ b/config/mk/global/defs.mk.in
@@ -13,7 +13,8 @@ netcdf      = @def_netcdf@
 scalapack   = @def_scalapack@
 slepc       = @def_slepc@
 fft         = @def_fft@
-xcpp        = @def_netcdf@ @def_mpi@ @def_fft@ @def_slepc@ @def_scalapack@ @def_compiler@ @def_dp@ @def_openmp@ @def_time_profile@ @def_memory_profile@ @def_uspp@ @def_gpu@ @def_yaml@
+magma       = @def_magma@
+xcpp        = @def_netcdf@ @def_mpi@ @def_fft@ @def_slepc@ @def_scalapack@ @def_compiler@ @def_dp@ @def_openmp@ @def_time_profile@ @def_memory_profile@ @def_uspp@ @def_gpu@ @def_yaml@ @def_magma@
 p2ycpp      = @PW_CPP@
 keep_objs   = @enable_keep_objects@
 do_blacs    = @compile_blacs@
@@ -33,6 +34,8 @@ do_libxc    = @compile_libxc@
 do_devxlib  = @compile_devxlib@
 do_petsc    = @compile_petsc@
 do_slepc    = @compile_slepc@
+do_magma    = @compile_magma@
+do_magma_fmodules = @compile_magma_fmodules@
 shell       = @SHELL@
 package_bugreport = @PACKAGE_BUGREPORT@
 prefix      = @prefix@
diff --git a/config/mk/global/libraries.mk b/config/mk/global/libraries.mk
index c428e0dcea..428babb031 100644
--- a/config/mk/global/libraries.mk
+++ b/config/mk/global/libraries.mk
@@ -12,7 +12,11 @@ ifeq ($(wildcard config/mk/global/defs.mk),config/mk/global/defs.mk)
 endif
 include lib/archive/package.list
 #
-INT_LIBS      = qe_pseudo slatec math77 local
+ifeq ($(do_magma_fmodules),yes)
+  INT_LIBS = qe_pseudo slatec math77 local magma_fmodules
+else
+  INT_LIBS      = qe_pseudo slatec math77 local
+endif
 YAMBO_INT_LIBS= Yio 
 YLIBIO        = modules Yio
 YLIBIO_LD     = $(YLIBIO)
diff --git a/config/mk/local/makefile b/config/mk/local/makefile
index e01dc1456f..99d642fb8e 100644
--- a/config/mk/local/makefile
+++ b/config/mk/local/makefile
@@ -24,7 +24,7 @@ include $(compdir)/config/setup
 #
 idriver=$(IFLAG)$(includedir)/driver $(IFLAG)$(includedir)/version
 lf90include=$(IFLAG)$(includedir) $(IFLAG)$(includedir)/headers/common $(IFLAG)$(includedir)/headers/parser $(idriver)
-lf90libinclude=$(iiotk) $(inetcdff) $(inetcdf) $(ipetsc) $(islepc) $(ihdf5) $(ilibxc) $(idevxlib) $(icudalib) $(ifft) $(ifutile) $(iyaml) $(idriver)
+lf90libinclude=$(iiotk) $(inetcdff) $(inetcdf) $(ipetsc) $(islepc) $(imagma) $(ihdf5) $(ilibxc) $(idevxlib) $(icudalib) $(ifft) $(ifutile) $(iyaml) $(idriver)
 mfiles=find . -maxdepth 1 -name '*.mod'
 #
 # OBJECTS
diff --git a/config/report.in b/config/report.in
index df0f292e8d..247d609003 100644
--- a/config/report.in
+++ b/config/report.in
@@ -65,6 +65,8 @@
 #                 @PETSC_INCS_R@ 
 # [@SLEPC_check@] SLEPC     : @SLEPC_LIBS_R@
 #                 @SLEPC_INCS_R@ 
+# [@MAGMA_check@] MAGMA     : @MAGMA_LIBS_R@
+#                 @MAGMA_INCS_R@ (fortran modules to be compiled: @compile_magma_fmodules@) 
 #
 # > OTHERs: @DEVXLIB_info@
 #
@@ -82,8 +84,8 @@
 # FC kind = @FCKIND@ @FCVERSION@
 # MPI kind= @MPIKIND@
 #
-# [ CPP ] @CPP@ @CPPFLAGS_yambo@ @def_netcdf@ @def_mpi@ @def_fft@ @def_slepc@ @def_scalapack@ @def_compiler@ @def_dp@ @def_openmp@ @def_time_profile@ @def_uspp@ @def_gpu@ @def_yaml@ @PW_CPP@
-# [ FPP ] @FPP@ @def_netcdf@ @def_mpi@ @def_fft@ @def_slepc@ @def_scalapack@ @def_compiler@ @def_dp@ @def_openmp@ @def_time_profile@ @def_uspp@ @def_gpu@ @def_yaml@
+# [ CPP ] @CPP@ @CPPFLAGS_yambo@ @def_netcdf@ @def_mpi@ @def_fft@ @def_slepc@ @def_scalapack@ @def_compiler@ @def_dp@ @def_openmp@ @def_time_profile@ @def_uspp@ @def_gpu@ @def_yaml@ @PW_CPP@ @def_magma@
+# [ FPP ] @FPP@ @def_netcdf@ @def_mpi@ @def_fft@ @def_slepc@ @def_scalapack@ @def_compiler@ @def_dp@ @def_openmp@ @def_time_profile@ @def_uspp@ @def_gpu@ @def_yaml@ @def_magma@
 # [ CC  ] @CC@ @CFLAGS@
 # [ FC  ] @FC@ @FCFLAGS@ @OPENMPLIBS@ @GPU_FLAGS@
 # [ FCUF] @FCUFLAGS@ @GPU_FLAGS@
diff --git a/config/setup.in b/config/setup.in
index 8ae2e922fa..a19305e3a1 100644
--- a/config/setup.in
+++ b/config/setup.in
@@ -99,6 +99,8 @@ lfutile     = @FUTILE_LIBS@
 ifutile     = @FUTILE_INCS@
 letsf       = @ETSF_LIBS@
 ietsf       = @ETSF_INCS@
+lmagma      = @MAGMA_LIBS@
+imagma      = @MAGMA_INCS@
 mpipath     = @MPI_PATH@
 #
 # VPATH
diff --git a/configure b/configure
index a530132b0c..b8af7feab6 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Yambo 5.3.0 r.23931 h.89a5070b8.
+# Generated by GNU Autoconf 2.69 for Yambo 5.3.0 r.23931 h.89a5070b8.
 #
 # Report bugs to <yambo@yambo-code.org>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -17,16 +16,14 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # 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 $as_nop
+else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -36,46 +33,46 @@ esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+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 ||
@@ -84,6 +81,13 @@ if ${PATH_SEPARATOR+false} :; then
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -92,12 +96,8 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,10 +109,30 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -134,22 +154,20 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # 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 \$as_nop
+else
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -169,52 +187,42 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" )
-then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-else \$as_nop
+else
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
-blah=\$(echo \$(echo blah))
-test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
-  if (eval "$as_required") 2>/dev/null
-then :
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
-else $as_nop
+else
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
-then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-else $as_nop
+else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir$as_base
+	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
@@ -222,21 +230,14 @@ fi
        esac
   as_found=false
 done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
-  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi
-fi
+fi; }
+IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x
-then :
+      if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -254,19 +255,18 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno
-then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
-  if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
 $0: yambo@yambo-code.org about your system, including any
 $0: error possibly output before this message. Then install
 $0: a modern shell, or manually run the script under such a
@@ -294,7 +294,6 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -312,14 +311,6 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -334,7 +325,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -343,7 +334,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -382,13 +373,12 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else $as_nop
+else
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -400,27 +390,18 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else $as_nop
+else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -432,9 +413,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -461,7 +442,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -505,7 +486,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -519,10 +500,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -536,13 +513,6 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -619,36 +589,40 @@ ac_default_prefix=$PWD
 ac_unique_file="driver/yambo.F"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#ifdef STDC_HEADERS
 # include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
 #endif
 #ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
 # include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 compdir
 LAPACK_PETSC_INCS_R
@@ -667,6 +641,8 @@ PETSC_INCS_R
 PETSC_LIBS_R
 BLACS_INCS_R
 BLACS_LIBS_R
+MAGMA_INCS_R
+MAGMA_LIBS_R
 SCALAPACK_INCS_R
 SCALAPACK_LIBS_R
 LAPACK_INCS_R
@@ -693,6 +669,7 @@ MPI_info
 MPI_check
 LIBCUDA_check
 DEVXLIB_check
+MAGMA_check
 LIBXC_check
 YPY_check
 YDB_check
@@ -720,6 +697,14 @@ MEM_profile_check
 TIME_profile_check
 KEEP_OBJS_check
 DP_check
+internal_magma
+compile_magma_fmodules
+compile_magma
+enable_magma
+def_magma
+MAGMA_INCS
+MAGMA_LIBS
+NVIDIA_ARCH
 with_devxlib_branch
 DEVXLIB_info
 internal_devxlib
@@ -862,7 +847,6 @@ FFLAGS
 F77
 FPP
 CPPFLAGS_yambo
-CPP
 IFLAG
 FCLIBS
 OPENMPLIBS
@@ -896,9 +880,6 @@ AR
 MAKE
 ifGNUmake
 hostname
-SIZEOF_INT_P
-SET_MAKE
-LIBOBJS
 host_os
 host_vendor
 host_cpu
@@ -907,9 +888,15 @@ build_os
 build_vendor
 build_cpu
 build
+SIZEOF_INT_P
+SET_MAKE
+LIBOBJS
 ALLOCA
 Y_BRANCH
 GIT_CHECK
+EGREP
+GREP
+CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -954,7 +941,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1092,6 +1078,12 @@ with_devxlib_path
 with_devxlib_libdir
 with_devxlib_includedir
 with_devxlib_branch
+enable_magma
+with_magma_libs
+with_magma_incs
+with_magma_path
+with_magma_libdir
+with_magma_includedir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1101,10 +1093,10 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+CPP
 FC
 FCFLAGS
 UFLAGS
-CPP
 FPP
 F77
 FFLAGS
@@ -1149,7 +1141,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1179,6 +1170,8 @@ do
   *)    ac_optarg=yes ;;
   esac
 
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -1219,9 +1212,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1245,9 +1238,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1400,15 +1393,6 @@ do
   | -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=* \
@@ -1458,9 +1442,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1474,9 +1458,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1520,9 +1504,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1538,7 +1522,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1546,7 +1530,7 @@ fi
 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 runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1602,7 +1586,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1699,7 +1683,6 @@ Fine tuning of the installation directories:
   --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]
@@ -1781,6 +1764,8 @@ Optional Features:
                           The configure script will check CUDA installation
                           and report problems [default=yes]
   --enable-nvtx=<path>    Enable NVTX support [default=no]
+  --enable-magma          Enable suport for the BSE diagonalization using
+                          MAGMA. Default is no
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1872,7 +1857,7 @@ Optional Packages:
   --with-rocm-libdir=<path>     Path to the rocm lib directory
   --with-rocm-includedir=<path> Path to the rocm include directory
   --with-rocm-path=<path>       Path to rocm install directory
-  --with-mklgpu-libs=<libs>     Use librocm library <libs>
+  --with-mklgpu-libs=<libs>     Use the MKLGPU library <libs>
   --with-devxlib-libs=<libs>    Use devxlib libraries <libs>
   --with-devxlib-path=<path>    Path to devxlib install directory
   --with-devxlib-libdir=<path>  Path to the devxlib lib directory
@@ -1880,6 +1865,12 @@ Optional Packages:
                                 Path to the devxlib include directory
   --with-devxlib-branch=<branch>
                                 Use the <branch> of the devxlib repository.
+  --with-magma-libs=<libs>      Use Magma libraries <libs>
+  --with-magma-incs=<incs>      Use Magma includes <incs>
+  --with-magma-path=<path>      Path to the Magma install directory
+  --with-magma-libdir=<path>    Path to the Magma lib directory
+  --with-magma-includedir=<path>
+                                Path to the Magma include directory
 
 Some influential environment variables:
   CC          C compiler command
@@ -1889,10 +1880,10 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
   FC          Fortran compiler command
   FCFLAGS     Fortran compiler flags
   UFLAGS      Unoptimized Fortran flags
-  CPP         C preprocessor
   FPP         Fortran preprocessor
   F77         Fortran 77 compiler command
   FFLAGS      Fortran 77 compiler flags
@@ -1919,9 +1910,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1949,8 +1940,7 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for configure.gnu first; this name is used for a wrapper for
-    # Metaconfig's "Configure" on case-insensitive file systems.
+    # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1958,7 +1948,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1968,9 +1958,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 Yambo configure 5.3.0 r.23931 h.89a5070b8
-generated by GNU Autoconf 2.71
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1987,14 +1977,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2002,15 +1992,14 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2020,6 +2009,176 @@ fi
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ----------------------------------- ##
+## Report this to yambo@yambo-code.org ##
+## ----------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2027,28 +2186,26 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else $as_nop
+else
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2060,17 +2217,16 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-printf %s "checking for $2.$3... " >&6; }
-if eval test \${$4+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2079,15 +2235,14 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2096,19 +2251,18 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
-else $as_nop
+else
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
@@ -2120,18 +2274,17 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof ($2))
 	 return 0;
@@ -2139,13 +2292,12 @@ if (sizeof ($2))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2153,19 +2305,18 @@ if (sizeof (($2)))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2176,14 +2327,14 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2191,18 +2342,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }
-then :
+       }; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2217,79 +2367,102 @@ fi
 
 } # ac_fn_c_try_link
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
-# executables *can* be run.
-ac_fn_c_try_run ()
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }
-then :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
 
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-} # ac_fn_c_try_run
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-# ac_fn_fc_try_compile LINENO
-# ---------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_fc_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_fc_try_compile LINENO
+# ---------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_fc_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_fc_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2305,14 +2478,14 @@ fi
 ac_fn_fc_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2320,18 +2493,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_fc_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }
-then :
+       }; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2346,58 +2518,20 @@ fi
 
 } # ac_fn_fc_try_link
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }
-then :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_f77_try_compile LINENO
 # ----------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_f77_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2405,15 +2539,14 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2429,14 +2562,14 @@ fi
 ac_fn_f77_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2444,18 +2577,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }
-then :
+       }; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2470,136 +2602,44 @@ fi
 
 } # ac_fn_f77_try_link
 
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
-
-#include <limits.h>
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main (void)
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$3=yes"
-else $as_nop
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
 # ac_fn_fc_check_func LINENO FUNC VAR
 # -----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_fc_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       program main
 call $2
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$3=yes"
-else $as_nop
+else
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_fc_check_func
-ac_configure_args_raw=
-for ac_arg
-do
-  case $ac_arg in
-  *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  as_fn_append ac_configure_args_raw " '$ac_arg'"
-done
-
-case $ac_configure_args_raw in
-  *$as_nl*)
-    ac_safe_unquote= ;;
-  *)
-    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
-    ac_unsafe_a="$ac_unsafe_z#~"
-    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
-esac
-
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Yambo $as_me 5.3.0 r.23931 h.89a5070b8, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ $0$ac_configure_args_raw
+  $ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -2632,12 +2672,8 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    printf "%s\n" "PATH: $as_dir"
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2672,7 +2708,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2707,13 +2743,11 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    printf "%s\n" "## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2724,8 +2758,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2749,7 +2783,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 )
     echo
 
-    printf "%s\n" "## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2757,14 +2791,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2772,15 +2806,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2788,8 +2822,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       echo
     fi
     test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2803,48 +2837,63 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_files="$CONFIG_SITE"
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
-  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-
-for ac_site_file in $ac_site_files
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  case $ac_site_file in #(
-  */*) :
-     ;; #(
-  *) :
-    ac_site_file=./$ac_site_file ;;
-esac
-  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2854,508 +2903,92 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Test code for whether the C compiler supports C89 (global declarations)
-ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
-#include <stddef.h>
-#include <stdarg.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
-struct buf { int x; };
-struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
+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
 
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not \xHH hex character constants.
-   These do not provoke an error unfortunately, instead are silently treated
-   as an "x".  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
-   array size at least.  It is necessary to write \x00 == 0 to get something
-   that is true only with -std.  */
-int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) '\''x'\''
-int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
-               int, int);'
-
-# Test code for whether the C compiler supports C89 (body of main).
-ac_c_conftest_c89_main='
-ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
-'
-
-# Test code for whether the C compiler supports C99 (global declarations)
-ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# error "Compiler does not advertise C99 conformance"
-#endif
-
-#include <stdbool.h>
-extern int puts (const char *);
-extern int printf (const char *, ...);
-extern int dprintf (int, const char *, ...);
-extern void *malloc (size_t);
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-// dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
-#define debug(...) dprintf (2, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  #error "your preprocessor is broken"
-#endif
-#if BIG_OK
-#else
-  #error "your preprocessor is broken"
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str = "";
-  int number = 0;
-  float fnumber = 0;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case '\''s'\'': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case '\''d'\'': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case '\''f'\'': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-
-  return *str && number && fnumber;
-}
-'
-
-# Test code for whether the C compiler supports C99 (body of main).
-ac_c_conftest_c99_main='
-  // Check bool.
-  _Bool success = false;
-  success |= (argc != 0);
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = i * 1.234;
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
-
-  // work around unused variable warnings
-  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
-'
-
-# Test code for whether the C compiler supports C11 (global declarations)
-ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "Compiler does not advertise C11 conformance"
-#endif
-
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
-  int_alignment = _Alignof (int),
-  int_array_alignment = _Alignof (int[100]),
-  char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
-  int x;
-  _Static_assert (sizeof (int) <= sizeof (long int),
-                  "_Static_assert does not work in struct");
-  long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal[] = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
-  union {
-    struct { int i; int j; };
-    struct { int k; long int l; } w;
-  };
-  int m;
-} v1;
-'
-
-# Test code for whether the C compiler supports C11 (body of main).
-ac_c_conftest_c11_main='
-  _Static_assert ((offsetof (struct anonymous, i)
-		   == offsetof (struct anonymous, w.k)),
-		  "Anonymous union alignment botch");
-  v1.i = 2;
-  v1.w.k = 5;
-  ok |= v1.i != 5;
-'
-
-# Test code for whether the C compiler supports C11 (complete).
-ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-${ac_c_conftest_c11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  ${ac_c_conftest_c11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C99 (complete).
-ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C89 (complete).
-ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  return ok;
-}
-"
-
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-
-# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub"
-
-# Locations in which to look for auxiliary files.
-ac_aux_dir_candidates="${srcdir}/config"
-
-# Search for a directory containing all of the required auxiliary files,
-# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
-# If we don't find one directory that contains all the files we need,
-# we report the set of missing files from the *first* directory in
-# $ac_aux_dir_candidates and give up.
-ac_missing_aux_files=""
-ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in $ac_aux_dir_candidates
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-  as_found=:
-
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
-  ac_aux_dir_found=yes
-  ac_install_sh=
-  for ac_aux in $ac_aux_files
-  do
-    # As a special case, if "install-sh" is required, that requirement
-    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
-    # and $ac_install_sh is set appropriately for whichever one is found.
-    if test x"$ac_aux" = x"install-sh"
-    then
-      if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
-        ac_install_sh="${as_dir}install-sh -c"
-      elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
-        ac_install_sh="${as_dir}install.sh -c"
-      elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
-        ac_install_sh="${as_dir}shtool install -c"
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
-        else
-          break
-        fi
-      fi
-    else
-      if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
-        else
-          break
-        fi
-      fi
-    fi
-  done
-  if test "$ac_aux_dir_found" = yes; then
-    ac_aux_dir="$as_dir"
-    break
-  fi
-  ac_first_candidate=false
-
-  as_found=false
-done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
-  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
-fi
-
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-if test -f "${ac_aux_dir}config.guess"; then
-  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
-fi
-if test -f "${ac_aux_dir}config.sub"; then
-  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
-fi
-if test -f "$ac_aux_dir/configure"; then
-  ac_configure="$SHELL ${ac_aux_dir}configure"
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
-	    and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-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
-
-
-SVERSION="5"
-SSUBVERSION="3"
-SPATCHLEVEL="0"
-SREVISION="23931"
-SHASH="89a5070b8"
+SVERSION="5"
+SSUBVERSION="3"
+SPATCHLEVEL="0"
+SREVISION="23931"
+SHASH="89a5070b8"
 
 
 
@@ -3374,6 +3007,34 @@ compdir=`echo "$PWD"`
 if test "$prefix" = "NONE" ;      then prefix="$PWD" ; fi
 if test "$exec_prefix" = "NONE" ; then exec_prefix="$prefix" ; fi
 #
+ac_aux_dir=
+for ac_dir in config "$srcdir"/config; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
 
 
 #
@@ -3436,10 +3097,9 @@ fi
 # PATH FOR EXT LIBS
 
 # Check whether --with-extlibs_path was given.
-if test ${with_extlibs_path+y}
-then :
+if test "${with_extlibs_path+set}" = set; then :
   withval=$with_extlibs_path; extlibs_path="$with_extlibs_path"
-else $as_nop
+else
   extlibs_path="${PWD}/lib/external"
 fi
 
@@ -3450,8 +3110,7 @@ if test x"$extlibs_path" = "x"; then extlibs_path="${PWD}/lib/external"; fi
 # ============================================================================
 # DEBUG
 # Check whether --enable-keep-objects was given.
-if test ${enable_keep_objects+y}
-then :
+if test "${enable_keep_objects+set}" = set; then :
   enableval=$enable_keep_objects;
 fi
 
@@ -3462,8 +3121,7 @@ if test x"$enable_keep_objects" = "x"; then enable_keep_objects="yes"; fi
 # =============================================================================
 # KEEP SOURCE FILES
 # Check whether --enable-keep-src was given.
-if test ${enable_keep_src+y}
-then :
+if test "${enable_keep_src+set}" = set; then :
   enableval=$enable_keep_src;
 fi
 
@@ -3474,8 +3132,7 @@ if test x"$enable_keep_src" = "xyes"; then enable_keep_src="yes"; fi
 # ============================================================================
 # KEEP EXT LIBS
 # Check whether --enable-keep-extlibs was given.
-if test ${enable_keep_extlibs+y}
-then :
+if test "${enable_keep_extlibs+set}" = set; then :
   enableval=$enable_keep_extlibs;
 fi
 
@@ -3493,8 +3150,7 @@ fi
 # ============================================================================
 # DP
 # Check whether --enable-dp was given.
-if test ${enable_dp+y}
-then :
+if test "${enable_dp+set}" = set; then :
   enableval=$enable_dp;
 fi
 
@@ -3513,8 +3169,7 @@ if test x"$build_precision" = "x"; then as_fn_error $? "Non correct specificatio
 # Time Profiling (mod_timing)
 #
 # Check whether --enable-time-profile was given.
-if test ${enable_time_profile+y}
-then :
+if test "${enable_time_profile+set}" = set; then :
   enableval=$enable_time_profile;
 fi
 
@@ -3530,8 +3185,7 @@ fi
 # USPP
 #
 # Check whether --enable-uspp was given.
-if test ${enable_uspp+y}
-then :
+if test "${enable_uspp+set}" = set; then :
   enableval=$enable_uspp;
 fi
 
@@ -3548,8 +3202,7 @@ fi
 # Memory Profiling
 #
 # Check whether --enable-memory-profile was given.
-if test ${enable_memory_profile+y}
-then :
+if test "${enable_memory_profile+set}" = set; then :
   enableval=$enable_memory_profile;
 fi
 
@@ -3565,8 +3218,7 @@ fi
 # Verbose compilation
 #
 # Check whether --enable-msgs-comps was given.
-if test ${enable_msgs_comps+y}
-then :
+if test "${enable_msgs_comps+set}" = set; then :
   enableval=$enable_msgs_comps;
 fi
 
@@ -3583,10 +3235,9 @@ fi
 #
 
 # Check whether --with-editor was given.
-if test ${with_editor+y}
-then :
+if test "${with_editor+set}" = set; then :
   withval=$with_editor;
-else $as_nop
+else
   with_editor="vim vi pico"
 fi
 
@@ -3594,12 +3245,11 @@ for ac_prog in $with_editor
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_editor+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_editor+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$editor"; then
   ac_cv_prog_editor="$editor" # Let the user override the test.
 else
@@ -3607,15 +3257,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_editor="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3626,11 +3272,11 @@ fi
 fi
 editor=$ac_cv_prog_editor
 if test -n "$editor"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $editor" >&5
-printf "%s\n" "$editor" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $editor" >&5
+$as_echo "$editor" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3645,10 +3291,9 @@ test -n "$editor" || editor="none"
 #
 
 # Check whether --with-echo was given.
-if test ${with_echo+y}
-then :
+if test "${with_echo+set}" = set; then :
   withval=$with_echo;
-else $as_nop
+else
   with_echo="echo"
 fi
 
@@ -3661,15 +3306,6 @@ ECHO=$with_echo
 #
 # check if the structure mallinfo is present in malloc.h
 SAVE=$CFLAGS
-
-
-
-
-
-
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3678,12 +3314,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3691,15 +3326,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3710,11 +3341,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3723,12 +3354,11 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3736,15 +3366,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3755,11 +3381,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3767,8 +3393,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3781,12 +3407,11 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3794,15 +3419,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3813,11 +3434,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3826,12 +3447,11 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3840,19 +3460,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3868,18 +3484,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3890,12 +3506,11 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3903,15 +3518,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3922,11 +3533,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3939,12 +3550,11 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3952,15 +3562,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3971,11 +3577,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3987,138 +3593,34 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
-set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "clang", so it can be a program name with args.
-set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
-else
-  CC="$ac_cv_prog_CC"
 fi
 
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
+for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4128,7 +3630,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4136,7 +3638,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -4148,9 +3650,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4171,12 +3673,11 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -4193,7 +3694,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -4209,46 +3710,44 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
+else
   ac_file=''
 fi
-if test -z "$ac_file"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4262,15 +3761,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -4279,7 +3778,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -4291,8 +3790,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -4300,10 +3799,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -4311,40 +3810,39 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot run C compiled programs.
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-printf %s "checking for suffix of object files... " >&6; }
-if test ${ac_cv_objext+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -4358,12 +3856,11 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -4372,32 +3869,31 @@ then :
        break;;
   esac
 done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -4407,33 +3903,29 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -4442,266 +3934,580 @@ else $as_nop
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
 {
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+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
+
+
+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 how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+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
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_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$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_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$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_g=yes
-else $as_nop
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
 
-int
-main (void)
-{
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
 
-else $as_nop
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  ac_cv_header_stdc=no
 fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c11_program
+#include <string.h>
+
 _ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
+rm -f conftest*
+
 fi
 
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c99_program
+#include <stdlib.h>
+
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
+rm -f conftest*
+
 fi
 
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c89_program
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c89=$ac_arg
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
-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
-
-
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
-  if test $ac_cache; then
-    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
-    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
-    fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
-  fi
-done
-
-
-
-
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
+fi
 
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
+done
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = xyes
-then :
+ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = xyes; then :
   have_malloc_h=1
-else $as_nop
+else
   have_malloc_h=0
 fi
 
+
 CFLAGS=$SAVE
 if test "$have_malloc_h" -ne 0
 then
 ac_fn_c_check_member "$LINENO" "struct mallinfo" "arena" "ac_cv_member_struct_mallinfo_arena" "#include <malloc.h>
 "
-if test "x$ac_cv_member_struct_mallinfo_arena" = xyes
-then :
-  printf "%s\n" "#define HAVE_MALLINFO 1" >>confdefs.h
+if test "x$ac_cv_member_struct_mallinfo_arena" = xyes; then :
+  $as_echo "#define HAVE_MALLINFO 1" >>confdefs.h
 
 fi
 
@@ -5032,12 +4838,11 @@ EOF
 Y_BRANCH="unknown"
 # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_GIT_CHECK+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GIT_CHECK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$GIT_CHECK"; then
   ac_cv_prog_GIT_CHECK="$GIT_CHECK" # Let the user override the test.
 else
@@ -5045,15 +4850,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_GIT_CHECK="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5064,11 +4865,11 @@ fi
 fi
 GIT_CHECK=$ac_cv_prog_GIT_CHECK
 if test -n "$GIT_CHECK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GIT_CHECK" >&5
-printf "%s\n" "$GIT_CHECK" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT_CHECK" >&5
+$as_echo "$GIT_CHECK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5082,60 +4883,42 @@ fi
 #
 # Checks for library functions.
 # ============================================================================
-ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h
+for ac_header in malloc.h stdlib.h unistd.h string.h sys/time.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
 
-fi
+done
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes
-then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
-else $as_nop
+else
 
-printf "%s\n" "#define size_t unsigned int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
 
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-printf %s "checking for working alloca.h... " >&6; }
-if test ${ac_cv_working_alloca_h+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -5143,52 +4926,52 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
-else $as_nop
+else
   ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-printf %s "checking for alloca... " >&6; }
-if test ${ac_cv_func_alloca_works+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_working_alloca_h = yes; then
-  ac_cv_func_alloca_works=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stddef.h>
-#ifndef alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-# elif defined _MSC_VER
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef  __cplusplus
-extern "C"
-#  endif
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca (size_t);
+#    endif
+#   endif
+#  endif
 # endif
 #endif
 
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -5196,22 +4979,20 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
-else $as_nop
+else
   ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -5221,19 +5002,58 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
 
+  done
+fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-printf %s "checking stack direction for C alloca... " >&6; }
-if test ${ac_cv_c_stack_direction+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -5254,10 +5074,9 @@ main (int argc, char **argv)
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
-else $as_nop
+else
   ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5265,24 +5084,25 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
 
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-printf %s "checking for an ANSI C-conforming const... " >&6; }
-if test ${ac_cv_c_const+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
 #ifndef __cplusplus
@@ -5295,7 +5115,7 @@ main (void)
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
-  /* IBM XL C 1.02.0.0 rejects this.
+  /* AIX XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
@@ -5323,7 +5143,7 @@ main (void)
     iptr p = 0;
     ++p;
   }
-  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap[3]; } bx;
     struct s *b = &bx; b->j = 5;
@@ -5339,50 +5159,47 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
-else $as_nop
+else
   ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-printf "%s\n" "$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-printf "%s\n" "#define const /**/" >>confdefs.h
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-printf %s "checking for inline... " >&6; }
-if test ${ac_cv_c_inline+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo (void) {return 0; }
-$ac_kw foo_t foo (void) {return 0; }
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-printf "%s\n" "$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5399,118 +5216,45 @@ _ACEOF
     ;;
 esac
 
-
-
-
-  # Make sure we can run config.sub.
-$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-printf %s "checking build system type... " >&6; }
-if test ${ac_cv_build+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+for ac_header in stdlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDLIB_H 1
+_ACEOF
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
+done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-printf %s "checking host system type... " >&6; }
-if test ${ac_cv_host+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_malloc_0_nonnull=no
 else
-  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-printf %s "checking for GNU libc compatible malloc... " >&6; }
-if test ${ac_cv_func_malloc_0_nonnull+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
-  case "$host_os" in # ((
-		  # Guess yes on platforms where we know the result.
-		  *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-		  | hpux* | solaris* | cygwin* | mingw* | msys* )
-		    ac_cv_func_malloc_0_nonnull=yes ;;
-		  # If we don't know, assume the worst.
-		  *) ac_cv_func_malloc_0_nonnull=no ;;
-		esac
-else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
 
 int
-main (void)
+main ()
 {
-void *p = malloc (0);
-		   int result = !p;
-		   free (p);
-		   return result;
+return ! malloc (0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_malloc_0_nonnull=yes
-else $as_nop
+else
   ac_cv_func_malloc_0_nonnull=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5518,15 +5262,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
 
-printf "%s\n" "#define HAVE_MALLOC 1" >>confdefs.h
+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
 
-else $as_nop
-  printf "%s\n" "#define HAVE_MALLOC 0" >>confdefs.h
+else
+  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
 
    case " $LIBOBJS " in
   *" malloc.$ac_objext "* ) ;;
@@ -5535,47 +5278,50 @@ else $as_nop
 esac
 
 
-printf "%s\n" "#define malloc rpl_malloc" >>confdefs.h
+$as_echo "#define malloc rpl_malloc" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
-printf %s "checking for GNU libc compatible realloc... " >&6; }
-if test ${ac_cv_func_realloc_0_nonnull+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
-  case "$host_os" in # ((
-		  # Guess yes on platforms where we know the result.
-		  *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-		  | hpux* | solaris* | cygwin* | mingw* | msys* )
-		    ac_cv_func_realloc_0_nonnull=yes ;;
-		  # If we don't know, assume the worst.
-		  *) ac_cv_func_realloc_0_nonnull=no ;;
-		esac
-else $as_nop
+for ac_header in stdlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDLIB_H 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_realloc_0_nonnull=no
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *realloc ();
+#endif
 
 int
-main (void)
+main ()
 {
-void *p = realloc (0, 0);
-		   int result = !p;
-		   free (p);
-		   return result;
+return ! realloc (0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_realloc_0_nonnull=yes
-else $as_nop
+else
   ac_cv_func_realloc_0_nonnull=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5583,15 +5329,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_realloc_0_nonnull" >&6; }
-if test $ac_cv_func_realloc_0_nonnull = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+if test $ac_cv_func_realloc_0_nonnull = yes; then :
 
-printf "%s\n" "#define HAVE_REALLOC 1" >>confdefs.h
+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
 
-else $as_nop
-  printf "%s\n" "#define HAVE_REALLOC 0" >>confdefs.h
+else
+  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
 
    case " $LIBOBJS " in
   *" realloc.$ac_objext "* ) ;;
@@ -5600,34 +5345,27 @@ else $as_nop
 esac
 
 
-printf "%s\n" "#define realloc rpl_realloc" >>confdefs.h
+$as_echo "#define realloc rpl_realloc" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
-printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
-if test ${ac_cv_func_lstat_dereferences_slashed_symlink+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   rm -f conftest.sym conftest.file
 echo >conftest.file
 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-  if test "$cross_compiling" = yes
-then :
-  case "$host_os" in # ((
-			   # Guess yes on glibc systems.
-		   *-gnu*) ac_cv_func_lstat_dereferences_slashed_symlink=yes ;;
-			   # If we don't know, assume the worst.
-		   *)      ac_cv_func_lstat_dereferences_slashed_symlink=no ;;
-		 esac
-else $as_nop
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main (void)
+main ()
 {
 struct stat sbuf;
      /* Linux will dereference the symlink and fail, as required by POSIX.
@@ -5638,10 +5376,9 @@ struct stat sbuf;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_lstat_dereferences_slashed_symlink=yes
-else $as_nop
+else
   ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5656,12 +5393,14 @@ fi
 rm -f conftest.sym conftest.file
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-printf "%s\n" "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
 
 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
 
-printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+_ACEOF
 
 
 if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
@@ -5673,21 +5412,19 @@ esac
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
-printf %s "checking whether stat accepts an empty string... " >&6; }
-if test ${ac_cv_func_stat_empty_string_bug+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+$as_echo_n "checking whether stat accepts an empty string... " >&6; }
+if ${ac_cv_func_stat_empty_string_bug+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_stat_empty_string_bug=yes
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main (void)
+main ()
 {
 struct stat sbuf;
   return stat ("", &sbuf) == 0;
@@ -5695,10 +5432,9 @@ struct stat sbuf;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_stat_empty_string_bug=no
-else $as_nop
+else
   ac_cv_func_stat_empty_string_bug=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5706,8 +5442,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
-printf "%s\n" "$ac_cv_func_stat_empty_string_bug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
+$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
 if test $ac_cv_func_stat_empty_string_bug = yes; then
   case " $LIBOBJS " in
   *" stat.$ac_objext "* ) ;;
@@ -5716,18 +5452,19 @@ if test $ac_cv_func_stat_empty_string_bug = yes; then
 esac
 
 
-printf "%s\n" "#define HAVE_STAT_EMPTY_STRING_BUG 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STAT_EMPTY_STRING_BUG 1
+_ACEOF
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval test \${ac_cv_prog_make_${ac_make}_set+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -5743,20 +5480,20 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # ============================================================================
 # check size of pointers to int - needed to decide the size of integer
 # arrays in fortran holding C pointers for FFTW
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the size of a pointer" >&5
-printf %s "checking for the size of a pointer... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the size of a pointer" >&5
+$as_echo_n "checking for the size of a pointer... " >&6; }
 
   if test -z "$POINTER_SIZE"; then
   cat >pointertest.c <<EOF
@@ -5770,7 +5507,7 @@ EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     ac_try=""
   else
@@ -5782,10 +5519,12 @@ EOF
   ac_pointersize=`./pointertest.x`;
   rm -rf pointertest*
 
-printf "%s\n" "#define POINTER_SIZE ${ac_pointersize}" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define POINTER_SIZE ${ac_pointersize}
+_ACEOF
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${ac_pointersize} bytes" >&5
-printf "%s\n" "${ac_pointersize} bytes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_pointersize} bytes" >&5
+$as_echo "${ac_pointersize} bytes" >&6; }
 fi
 
 SIZEOF_INT_P=$ac_pointersize
@@ -5801,12 +5540,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5814,15 +5552,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5833,11 +5567,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5846,12 +5580,11 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -5859,15 +5592,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5878,11 +5607,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5890,8 +5619,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5904,12 +5633,11 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5917,15 +5645,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5936,11 +5660,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5949,12 +5673,11 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5963,19 +5686,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5991,18 +5710,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6013,12 +5732,11 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -6026,15 +5744,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6045,11 +5759,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6062,12 +5776,11 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -6075,15 +5788,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6094,11 +5803,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6110,138 +5819,34 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
-set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "clang", so it can be a program name with args.
-set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
-else
-  CC="$ac_cv_prog_CC"
 fi
 
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
+for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6251,21 +5856,20 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -6275,33 +5879,29 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -6310,60 +5910,57 @@ else $as_nop
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else $as_nop
+else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -6378,144 +5975,94 @@ else
     CFLAGS=
   fi
 fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c89_program
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-fi
 
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
 fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
 fi
 
 ac_ext=c
@@ -6525,18 +6072,87 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 #
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
 
 hostname=`uname -n`
 
 # ============================================================================
 # GNU Make
 MAKE="make"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
-printf %s "checking for GNU make... " >&6; }
-if test ${_cv_gnu_make_command+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+$as_echo_n "checking for GNU make... " >&6; }
+if ${_cv_gnu_make_command+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   _cv_gnu_make_command='' ;
                 for a in "$MAKE" make gmake gnumake ; do
                         if test -z "$a" ; then continue ; fi ;
@@ -6547,14 +6163,14 @@ else $as_nop
                 done ;
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
-printf "%s\n" "$_cv_gnu_make_command" >&6; } ;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
+$as_echo "$_cv_gnu_make_command" >&6; } ;
         if test  "x$_cv_gnu_make_command" != "x"  ; then
                 ifGNUmake='' ;
         else
                 ifGNUmake='#' ;
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"Not found\"" >&5
-printf "%s\n" "\"Not found\"" >&6; };
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"Not found\"" >&5
+$as_echo "\"Not found\"" >&6; };
         fi
 
 
@@ -6576,12 +6192,11 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -6589,15 +6204,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6608,11 +6219,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6621,12 +6232,11 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_AR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -6634,15 +6244,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6653,11 +6259,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -6665,8 +6271,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6684,8 +6290,7 @@ test -z "$AR_FLAGS" && AR_FLAGS="-r"
 # C options specific for driver.c
 #
 # Check whether --enable-options_check was given.
-if test ${enable_options_check+y}
-then :
+if test "${enable_options_check+set}" = set; then :
   enableval=$enable_options_check;
 fi
 
@@ -6709,12 +6314,11 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_FC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_FC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$FC"; then
   ac_cv_prog_FC="$FC" # Let the user override the test.
 else
@@ -6722,15 +6326,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6741,11 +6341,11 @@ fi
 fi
 FC=$ac_cv_prog_FC
 if test -n "$FC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-printf "%s\n" "$FC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+$as_echo "$FC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6758,12 +6358,11 @@ if test -z "$FC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_FC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_FC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_FC"; then
   ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
 else
@@ -6771,15 +6370,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_FC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6790,11 +6385,11 @@ fi
 fi
 ac_ct_FC=$ac_cv_prog_ac_ct_FC
 if test -n "$ac_ct_FC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
-printf "%s\n" "$ac_ct_FC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
+$as_echo "$ac_ct_FC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6806,8 +6401,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     FC=$ac_ct_FC
@@ -6816,7 +6411,7 @@ fi
 
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -6826,7 +6421,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6836,7 +6431,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 rm -f a.out
@@ -6845,12 +6440,11 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran" >&5
-printf %s "checking whether the compiler supports GNU Fortran... " >&6; }
-if test ${ac_cv_fc_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
+if ${ac_cv_fc_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       program main
 #ifndef __GNUC__
@@ -6859,48 +6453,43 @@ else $as_nop
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_fc_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_fc_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
+$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
-ac_test_FCFLAGS=${FCFLAGS+y}
+ac_test_FCFLAGS=${FCFLAGS+set}
 ac_save_FCFLAGS=$FCFLAGS
 FCFLAGS=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
-printf %s "checking whether $FC accepts -g... " >&6; }
-if test ${ac_cv_prog_fc_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
+$as_echo_n "checking whether $FC accepts -g... " >&6; }
+if ${ac_cv_prog_fc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   FCFLAGS=-g
 cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_cv_prog_fc_g=yes
-else $as_nop
+else
   ac_cv_prog_fc_g=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
-printf "%s\n" "$ac_cv_prog_fc_g" >&6; }
-if test $ac_test_FCFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
+$as_echo "$ac_cv_prog_fc_g" >&6; }
+if test "$ac_test_FCFLAGS" = set; then
   FCFLAGS=$ac_save_FCFLAGS
 elif test $ac_cv_prog_fc_g = yes; then
   if test "x$ac_cv_fc_compiler_gnu" = xyes; then
@@ -6934,8 +6523,8 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the current OS is supported" >&5
-printf %s "checking if the current OS is supported... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the current OS is supported" >&5
+$as_echo_n "checking if the current OS is supported... " >&6; }
 #TIMER="ct_cclock.o"
 TIMER="ct_cptimer.o"
 case "${host}" in
@@ -6979,31 +6568,31 @@ case "${host}" in
    if test -z "$F90SUFFIX"; then F90SUFFIX=".f90"; fi
    ;;
   *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Platform <${host}> is not supported." >&5
-printf "%s\n" "$as_me: Platform <${host}> is not supported." >&6;}
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Please contact the $PACKAGE_NAME team at $PACKAGE_BUGREPORT" >&5
-printf "%s\n" "$as_me: Please contact the $PACKAGE_NAME team at $PACKAGE_BUGREPORT" >&6;}
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: providing either a list of compilers and options or" >&5
-printf "%s\n" "$as_me: providing either a list of compilers and options or" >&6;}
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: a guest account on this machine." >&5
-printf "%s\n" "$as_me: a guest account on this machine." >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Platform <${host}> is not supported." >&5
+$as_echo "$as_me: Platform <${host}> is not supported." >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Please contact the $PACKAGE_NAME team at $PACKAGE_BUGREPORT" >&5
+$as_echo "$as_me: Please contact the $PACKAGE_NAME team at $PACKAGE_BUGREPORT" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: providing either a list of compilers and options or" >&5
+$as_echo "$as_me: providing either a list of compilers and options or" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: a guest account on this machine." >&5
+$as_echo "$as_me: a guest account on this machine." >&6;}
    as_fn_error $? "stopping" "$LINENO" 5
    ;;
  *)
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WIDESETUP: using build_os=\"$build_os\"" >&5
-printf "%s\n" "$as_me: WIDESETUP: using build_os=\"$build_os\"" >&6;}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WIDESETUP: using F90SUFFIX=\"$F90SUFFIX\"" >&5
-printf "%s\n" "$as_me: WIDESETUP: using F90SUFFIX=\"$F90SUFFIX\"" >&6;}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WIDESETUP: using AR=\"$AR\"" >&5
-printf "%s\n" "$as_me: WIDESETUP: using AR=\"$AR\"" >&6;}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WIDESETUP: using AR_FLAGS=\"$AR_FLAGS\"" >&5
-printf "%s\n" "$as_me: WIDESETUP: using AR_FLAGS=\"$AR_FLAGS\"" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WIDESETUP: using build_os=\"$build_os\"" >&5
+$as_echo "$as_me: WIDESETUP: using build_os=\"$build_os\"" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WIDESETUP: using F90SUFFIX=\"$F90SUFFIX\"" >&5
+$as_echo "$as_me: WIDESETUP: using F90SUFFIX=\"$F90SUFFIX\"" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WIDESETUP: using AR=\"$AR\"" >&5
+$as_echo "$as_me: WIDESETUP: using AR=\"$AR\"" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WIDESETUP: using AR_FLAGS=\"$AR_FLAGS\"" >&5
+$as_echo "$as_me: WIDESETUP: using AR_FLAGS=\"$AR_FLAGS\"" >&6;}
 
 
 
@@ -7019,8 +6608,7 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 #
 
 # Check whether --with-f90ext was given.
-if test ${with_f90ext+y}
-then :
+if test "${with_f90ext+set}" = set; then :
   withval=$with_f90ext;
 fi
 
@@ -7032,12 +6620,11 @@ ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f90 files" >&5
-printf %s "checking for Fortran flag to compile .f90 files... " >&6; }
-if test ${ac_cv_fc_srcext_f90+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f90 files" >&5
+$as_echo_n "checking for Fortran flag to compile .f90 files... " >&6; }
+if ${ac_cv_fc_srcext_f90+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_ext=f90
 ac_fcflags_srcext_save=$ac_fcflags_srcext
 ac_fcflags_srcext=
@@ -7053,18 +6640,17 @@ for ac_flag in none -qsuffix=f=f90 -Tf "-x $ac_try"; do
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_cv_fc_srcext_f90=$ac_flag; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest.$ac_objext conftest.f90
 ac_fcflags_srcext=$ac_fcflags_srcext_save
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f90" >&5
-printf "%s\n" "$ac_cv_fc_srcext_f90" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f90" >&5
+$as_echo "$ac_cv_fc_srcext_f90" >&6; }
 if test "x$ac_cv_fc_srcext_f90" = xunknown; then
   as_fn_error $? "Fortran could not compile .f90 files" "$LINENO" 5
 else
@@ -7090,12 +6676,11 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f files" >&5
-printf %s "checking for Fortran flag to compile .f files... " >&6; }
-if test ${ac_cv_fc_srcext_f+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f files" >&5
+$as_echo_n "checking for Fortran flag to compile .f files... " >&6; }
+if ${ac_cv_fc_srcext_f+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_ext=f
 ac_fcflags_srcext_save=$ac_fcflags_srcext
 ac_fcflags_srcext=
@@ -7111,18 +6696,17 @@ for ac_flag in none -qsuffix=f=f -Tf "-x $ac_try"; do
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_cv_fc_srcext_f=$ac_flag; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest.$ac_objext conftest.f
 ac_fcflags_srcext=$ac_fcflags_srcext_save
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f" >&5
-printf "%s\n" "$ac_cv_fc_srcext_f" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f" >&5
+$as_echo "$ac_cv_fc_srcext_f" >&6; }
 if test "x$ac_cv_fc_srcext_f" = xunknown; then
   as_fn_error $? "Fortran could not compile .f files" "$LINENO" 5
 else
@@ -7221,10 +6805,10 @@ esac
 #
 FCVERSION=`echo "$FCVERSION" | sed "/^\s*$/d" | head -n 1`
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $FC kind and version" >&5
-printf %s "checking for $FC kind and version... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FCKIND $FCVERSION $INTELVERSION" >&5
-printf "%s\n" "$FCKIND $FCVERSION $INTELVERSION" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FC kind and version" >&5
+$as_echo_n "checking for $FC kind and version... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FCKIND $FCVERSION $INTELVERSION" >&5
+$as_echo "$FCKIND $FCVERSION $INTELVERSION" >&6; }
 
 
 
@@ -7241,8 +6825,7 @@ printf "%s\n" "$FCKIND $FCVERSION $INTELVERSION" >&6; }
 if test -z "${CFLAGS}"; then CFLAGS="-O2"; fi
 #
 # Check whether --enable-debug-flags was given.
-if test ${enable_debug_flags+y}
-then :
+if test "${enable_debug_flags+set}" = set; then :
   enableval=$enable_debug_flags;
 fi
 
@@ -7681,35 +7264,35 @@ esac
 #
 if test "x$build_os" = "xaix" ; then NETCDFFLAGS="$NETCDFFLAGS -DIBMR2Fortran" ; fi
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specific $FC flags" >&5
-printf %s "checking for specific $FC flags... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specific $FC flags" >&5
+$as_echo_n "checking for specific $FC flags... " >&6; }
 if test -z "${FCFLAGS}"; then
  FCFLAGS="$SYSFLAGS"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FCFLAGS" >&5
-printf "%s\n" "$FCFLAGS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FCFLAGS" >&5
+$as_echo "$FCFLAGS" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (User-defined) $FCFLAGS" >&5
-printf "%s\n" "(User-defined) $FCFLAGS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (User-defined) $FCFLAGS" >&5
+$as_echo "(User-defined) $FCFLAGS" >&6; }
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specific Open-MP flags" >&5
-printf %s "checking for specific Open-MP flags... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OMPFLAGS" >&5
-printf "%s\n" "$OMPFLAGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specific Open-MP flags" >&5
+$as_echo_n "checking for specific Open-MP flags... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OMPFLAGS" >&5
+$as_echo "$OMPFLAGS" >&6; }
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specific $CC flags" >&5
-printf %s "checking for specific $CC flags... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5
-printf "%s\n" "$CFLAGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specific $CC flags" >&5
+$as_echo_n "checking for specific $CC flags... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5
+$as_echo "$CFLAGS" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specific unoptimized flags" >&5
-printf %s "checking for specific unoptimized flags... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specific unoptimized flags" >&5
+$as_echo_n "checking for specific unoptimized flags... " >&6; }
 if test -z "${UFLAGS}"; then
  FCUFLAGS="$FUFLAGS"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FCUFLAGS" >&5
-printf "%s\n" "$FCUFLAGS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FCUFLAGS" >&5
+$as_echo "$FCUFLAGS" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (User-defined) $UFLAGS" >&5
-printf "%s\n" "(User-defined) $UFLAGS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (User-defined) $UFLAGS" >&5
+$as_echo "(User-defined) $UFLAGS" >&6; }
  FCUFLAGS="$UFLAGS"
  FUFLAGS="$UFLAGS"
 fi
@@ -7720,10 +7303,10 @@ if test x"$enable_debug_flags" = "xyes"; then
  HDF5_MODE="debug";
 fi
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specific NETCDF flags" >&5
-printf %s "checking for specific NETCDF flags... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NETCDFFLAGS" >&5
-printf "%s\n" "$NETCDFFLAGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specific NETCDF flags" >&5
+$as_echo_n "checking for specific NETCDF flags... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NETCDFFLAGS" >&5
+$as_echo "$NETCDFFLAGS" >&6; }
 #
 
 
@@ -7748,26 +7331,23 @@ FCFLAGS="$acx_save_fcflags $F90EXTFLAGS"
 GPU_SUPPORT="no_gpu"
 #
 # Check whether --enable-cuda_fortran was given.
-if test ${enable_cuda_fortran+y}
-then :
+if test "${enable_cuda_fortran+set}" = set; then :
   enableval=$enable_cuda_fortran;
-else $as_nop
+else
   enable_cuda_fortran="no"
 fi
 
 # Check whether --enable-openacc was given.
-if test ${enable_openacc+y}
-then :
+if test "${enable_openacc+set}" = set; then :
   enableval=$enable_openacc;
-else $as_nop
+else
   enable_openacc="no"
 fi
 
 # Check whether --enable-openmp5 was given.
-if test ${enable_openmp5+y}
-then :
+if test "${enable_openmp5+set}" = set; then :
   enableval=$enable_openmp5;
-else $as_nop
+else
   enable_openmp5="no"
 fi
 
@@ -7786,8 +7366,7 @@ if test x"$enable_openmp5" != "xno"      ; then GPU_SUPPORT="openmp5" ; fi
 # OpenMP
 #
 # Check whether --enable-open-mp was given.
-if test ${enable_open_mp+y}
-then :
+if test "${enable_open_mp+set}" = set; then :
   enableval=$enable_open_mp;
 fi
 
@@ -7809,19 +7388,17 @@ ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $FC" >&5
-printf %s "checking how to get verbose linking output from $FC... " >&6; }
-if test ${ac_cv_prog_fc_v+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $FC" >&5
+$as_echo_n "checking how to get verbose linking output from $FC... " >&6; }
+if ${ac_cv_prog_fc_v+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_cv_prog_fc_v=
 # Try some options frequently used verbose output
 for ac_verb in -v -verbose --verbose -V -\#\#\#; do
@@ -7839,13 +7416,13 @@ ac_save_FCFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_verb"
 eval "set x $ac_link"
 shift
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
 # LIBRARY_PATH; skip all such settings.
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
   sed '/^Driving:/d; /^Configured with:/d;
       '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-printf "%s\n" "$ac_fc_v_output" >&5
+$as_echo "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FCFLAGS
 
 rm -rf conftest*
@@ -7912,24 +7489,23 @@ esac
   done
 done
 if test -z "$ac_cv_prog_fc_v"; then
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $FC" >&5
-printf "%s\n" "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $FC" >&5
+$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
 fi
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
-printf "%s\n" "$as_me: WARNING: compilation failed" >&2;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
+$as_echo "$as_me: WARNING: compilation failed" >&2;}
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_v" >&5
-printf "%s\n" "$ac_cv_prog_fc_v" >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran libraries of $FC" >&5
-printf %s "checking for Fortran libraries of $FC... " >&6; }
-if test ${ac_cv_fc_libs+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_v" >&5
+$as_echo "$ac_cv_prog_fc_v" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran libraries of $FC" >&5
+$as_echo_n "checking for Fortran libraries of $FC... " >&6; }
+if ${ac_cv_fc_libs+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test "x$FCLIBS" != "x"; then
   ac_cv_fc_libs="$FCLIBS" # Let the user override the test.
 else
@@ -7948,13 +7524,13 @@ ac_save_FCFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
 eval "set x $ac_link"
 shift
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
 # LIBRARY_PATH; skip all such settings.
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
   sed '/^Driving:/d; /^Configured with:/d;
       '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-printf "%s\n" "$ac_fc_v_output" >&5
+$as_echo "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FCFLAGS
 
 rm -rf conftest*
@@ -8031,10 +7607,9 @@ while test $# != 1; do
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 fi
 	  ;;
@@ -8047,10 +7622,9 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   if test "$ac_compiler_gnu" = yes; then
   for ac_link_opt in $ac_arg; do
     ac_cv_fc_libs="$ac_cv_fc_libs -Xlinker $ac_link_opt"
@@ -8065,24 +7639,9 @@ fi
 	  |-LANG:=* | -LIST:* | -LNO:* | -link)
 	  ;;
 	-lkernel32)
-	  # Ignore this library only on Windows-like systems.
 	  case $host_os in
-	  cygwin* | msys* ) ;;
-	  *)
-	    ac_exists=false
-  for ac_i in $ac_cv_fc_libs; do
-    if test x"$ac_arg" = x"$ac_i"; then
-      ac_exists=true
-      break
-    fi
-  done
-
-  if test x"$ac_exists" = xtrue
-then :
-
-else $as_nop
-  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-fi
+	  *cygwin*) ;;
+	  *) ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 	    ;;
 	  esac
 	  ;;
@@ -8100,7 +7659,7 @@ fi
 	  esac
 	  ;;
 	-YP,*)
-	  for ac_j in `printf "%s\n" "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
+	  for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
 	      ac_exists=false
   for ac_i in $ac_cv_fc_libs; do
     if test x"$ac_j" = x"$ac_i"; then
@@ -8109,10 +7668,9 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   ac_arg="$ac_arg $ac_j"
 			       ac_cv_fc_libs="$ac_cv_fc_libs $ac_j"
 fi
@@ -8127,17 +7685,15 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 fi
 	  ;;
 	-zallextract*| -zdefaultextract)
 	  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 	  ;;
-	-mllvm) ${2+shift};; # Defend against 'clang -mllvm -loopopt=0'.
 	  # Ignore everything else.
   esac
 done
@@ -8149,7 +7705,7 @@ set X $ac_save_positional; shift
 # must begin with a "/").
 case `(uname -sr) 2>/dev/null` in
    "SunOS 5"*)
-      ac_ld_run_path=`printf "%s\n" "$ac_fc_v_output" |
+      ac_ld_run_path=`$as_echo "$ac_fc_v_output" |
 			sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
       test "x$ac_ld_run_path" != x &&
 	if test "$ac_compiler_gnu" = yes; then
@@ -8164,8 +7720,8 @@ esac
 fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_libs" >&5
-printf "%s\n" "$ac_cv_fc_libs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_libs" >&5
+$as_echo "$ac_cv_fc_libs" >&6; }
 FCLIBS="$ac_cv_fc_libs"
 
 
@@ -8180,12 +7736,11 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran libraries" >&5
-printf %s "checking for dummy main to link with Fortran libraries... " >&6; }
-if test ${ac_cv_fc_dummy_main+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran libraries" >&5
+$as_echo_n "checking for dummy main to link with Fortran libraries... " >&6; }
+if ${ac_cv_fc_dummy_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_fc_dm_save_LIBS=$LIBS
  LIBS="$LIBS $FCLIBS"
  ac_fortran_dm_var=FC_DUMMY_MAIN
@@ -8208,20 +7763,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #endif
 #endif
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_fortran_dummy_main=none
-else $as_nop
+else
   ac_cv_fortran_dummy_main=unknown
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
  if test $ac_cv_fortran_dummy_main = unknown; then
@@ -8238,18 +7792,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 #endif
 #endif
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_fortran_dummy_main=$ac_func; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
    done
  fi
@@ -8262,24 +7815,25 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
  LIBS=$ac_fc_dm_save_LIBS
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_dummy_main" >&5
-printf "%s\n" "$ac_cv_fc_dummy_main" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_dummy_main" >&5
+$as_echo "$ac_cv_fc_dummy_main" >&6; }
 FC_DUMMY_MAIN=$ac_cv_fc_dummy_main
-if test "$FC_DUMMY_MAIN" != unknown
-then :
+if test "$FC_DUMMY_MAIN" != unknown; then :
   if test $FC_DUMMY_MAIN != none; then
 
-printf "%s\n" "#define FC_DUMMY_MAIN $FC_DUMMY_MAIN" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define FC_DUMMY_MAIN $FC_DUMMY_MAIN
+_ACEOF
 
   if test "x$ac_cv_fc_dummy_main" = "x$ac_cv_f77_dummy_main"; then
 
-printf "%s\n" "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
+$as_echo "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
 
   fi
 fi
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "linking to Fortran libraries from C fails
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -8294,12 +7848,11 @@ ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran name-mangling scheme" >&5
-printf %s "checking for Fortran name-mangling scheme... " >&6; }
-if test ${ac_cv_fc_mangling+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran name-mangling scheme" >&5
+$as_echo_n "checking for Fortran name-mangling scheme... " >&6; }
+if ${ac_cv_fc_mangling+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       subroutine foobar()
       return
@@ -8308,8 +7861,7 @@ else $as_nop
       return
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   mv conftest.$ac_objext cfortran_test.$ac_objext
 
   ac_save_LIBS=$LIBS
@@ -8330,6 +7882,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char $ac_func ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -8340,18 +7895,17 @@ char $ac_func ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_success=yes; break 2
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     done
   done
@@ -8386,6 +7940,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char $ac_func ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -8396,18 +7953,17 @@ char $ac_func ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_success_extra=yes; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
      done
      ac_ext=${ac_fc_srcext-f}
@@ -8437,17 +7993,17 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
   LIBS=$ac_save_LIBS
   rm -rf conftest*
   rm -f cfortran_test*
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compile a simple Fortran program
 See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_mangling" >&5
-printf "%s\n" "$ac_cv_fc_mangling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_mangling" >&5
+$as_echo "$ac_cv_fc_mangling" >&6; }
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8470,8 +8026,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #define F90_FUNC_(name,NAME) name ## _
  void F90_FUNC_(ftest, FTEST)(){}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
  mv conftest.$ac_objext ftest.$ac_objext
  ac_ext=${ac_fc_srcext-f}
@@ -8486,11 +8041,10 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
       call ftest
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   c_success="yes"; msg="test_"; save="$CFLAGS"; CFLAGS="$save -D_C_US"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
  LIBS="$save_LIBS"
  ac_ext=c
@@ -8501,7 +8055,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
  rm -f ftest.$ac_objext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$c_success" = "no" ; then
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8509,8 +8063,7 @@ if test "$c_success" = "no" ; then
   #define F90_FUNC_(name,NAME) name
   void F90_FUNC_(ftest, FTEST)(){}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   mv conftest.$ac_objext ftest.$ac_objext
   ac_ext=${ac_fc_srcext-f}
@@ -8525,11 +8078,10 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
       call ftest
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   c_success="yes"; msg="test"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LIBS="$save"
   ac_ext=c
@@ -8540,12 +8092,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   rm -f ftest.$ac_objext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external C routine (test) naming scheme" >&5
-printf %s "checking for external C routine (test) naming scheme... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
-printf "%s\n" "$msg" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external C routine (test) naming scheme" >&5
+$as_echo_n "checking for external C routine (test) naming scheme... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
+$as_echo "$msg" >&6; }
 
 ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
@@ -8553,48 +8105,48 @@ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 case $ac_cv_fc_mangling in
   "lower case, no underscore, no extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) name" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) name" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) name" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) name" >>confdefs.h
  ;;
   "lower case, no underscore, extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) name" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) name" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
  ;;
   "lower case, underscore, no extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
  ;;
   "lower case, underscore, extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) name ## __" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) name ## __" >>confdefs.h
  ;;
   "upper case, no underscore, no extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) NAME" >>confdefs.h
  ;;
   "upper case, no underscore, extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
  ;;
   "upper case, underscore, no extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
  ;;
   "upper case, underscore, extra underscore")
-	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
 
-	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME ## __" >>confdefs.h
+	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## __" >>confdefs.h
  ;;
   *)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
-printf "%s\n" "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
+$as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
 	  ;;
 esac
 
@@ -8653,12 +8205,11 @@ ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran flag needed to accept free-form source" >&5
-printf %s "checking for Fortran flag needed to accept free-form source... " >&6; }
-if test ${ac_cv_fc_freeform+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran flag needed to accept free-form source" >&5
+$as_echo_n "checking for Fortran flag needed to accept free-form source... " >&6; }
+if ${ac_cv_fc_freeform+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_cv_fc_freeform=unknown
 ac_fc_freeform_FCFLAGS_save=$FCFLAGS
 for ac_flag in none -ffree-form -FR -free -qfree -Mfree -Mfreeform \
@@ -8673,18 +8224,17 @@ do
           'world.'
        end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_cv_fc_freeform=$ac_flag; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 FCFLAGS=$ac_fc_freeform_FCFLAGS_save
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_freeform" >&5
-printf "%s\n" "$ac_cv_fc_freeform" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_freeform" >&5
+$as_echo "$ac_cv_fc_freeform" >&6; }
 if test "x$ac_cv_fc_freeform" = xunknown; then
   as_fn_error 77 "Fortran does not accept free-form source" "$LINENO" 5
 else
@@ -8709,12 +8259,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #=============================================================================
 # FLAGS TO INCLUDE MODULE
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking fortran 90 modules inclusion flag" >&5
-printf %s "checking fortran 90 modules inclusion flag... " >&6; }
-if test ${ax_cv_f90_modflag+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking fortran 90 modules inclusion flag" >&5
+$as_echo_n "checking fortran 90 modules inclusion flag... " >&6; }
+if ${ax_cv_f90_modflag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
@@ -8737,11 +8286,10 @@ cat > conftest.$ac_ext <<_ACEOF
       end module conftest_module
 
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 cd ..
 ax_cv_f90_modflag="not found"
 for ax_flag in "-I" "-M" "-p"; do
@@ -8757,11 +8305,10 @@ for ax_flag in "-I" "-M" "-p"; do
       end program conftest_program
 
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ax_cv_f90_modflag="$ax_flag"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     FCFLAGS="$ax_save_FCFLAGS"
   fi
 done
@@ -8777,147 +8324,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_f90_modflag" >&5
-printf "%s\n" "$ax_cv_f90_modflag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_f90_modflag" >&5
+$as_echo "$ax_cv_f90_modflag" >&6; }
 IFLAG="$ax_cv_f90_modflag"
 if test -z "$IFLAG" ; then IFLAG="-I" ; fi
 
 #
 # ============================================================================
 # CPP check & flags
-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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test ${ac_cv_prog_CPP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-      # Double quotes because $CC needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-
-else $as_nop
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-  # Broken: success on invalid input.
-continue
-else $as_nop
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-
-else $as_nop
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-  # Broken: success on invalid input.
-continue
-else $as_nop
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
-
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-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
-
-
 
 #
 case "${CPP}" in
@@ -8969,8 +8383,8 @@ case "${CPP}" in
 esac
 #
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: testing C-preprocessor $CPP $CPPFLAGS" >&5
-printf "%s\n" "$as_me: testing C-preprocessor $CPP $CPPFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: testing C-preprocessor $CPP $CPPFLAGS" >&5
+$as_echo "$as_me: testing C-preprocessor $CPP $CPPFLAGS" >&6;}
 #
 # TESTS
 #=======
@@ -8987,8 +8401,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 #
 acx_C_ok=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if C precompiler works on C source" >&5
-printf %s "checking if C precompiler works on C source... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C precompiler works on C source" >&5
+$as_echo_n "checking if C precompiler works on C source... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9000,15 +8414,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #endif
 
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   acx_C_ok=yes
-else $as_nop
+else
   CPP_TESTS_PASSED=no
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acx_C_ok" >&5
-printf "%s\n" "$acx_C_ok" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_C_ok" >&5
+$as_echo "$acx_C_ok" >&6; }
 #
 if test "x$CPP_TESTS_PASSED" = xno ; then
   as_fn_error $? "Found C precompiler problems in processing C source." "$LINENO" 5;
@@ -9059,8 +8472,8 @@ esac
 #
 if test -z "$FPP" ; then FPP="cpp -E -P -ansi"; fi
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: testing FC-preprocessor $FPP" >&5
-printf "%s\n" "$as_me: testing FC-preprocessor $FPP" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: testing FC-preprocessor $FPP" >&5
+$as_echo "$as_me: testing FC-preprocessor $FPP" >&6;}
 #
 # TESTS
 #=======
@@ -9069,8 +8482,8 @@ printf "%s\n" "$as_me: testing FC-preprocessor $FPP" >&6;}
 #
 acx_FC_ok=yes
 FPP_TESTS_PASSED=yes
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if FC precompiler works on FC source" >&5
-printf %s "checking if FC precompiler works on FC source... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if FC precompiler works on FC source" >&5
+$as_echo_n "checking if FC precompiler works on FC source... " >&6; }
 cat > conftest.F << EOF_
  program conftest
  character (1) :: a
@@ -9097,8 +8510,8 @@ else
  acx_FC_ok=no ;
  FPP_TESTS_PASSED=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acx_FC_ok" >&5
-printf "%s\n" "$acx_FC_ok" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_FC_ok" >&5
+$as_echo "$acx_FC_ok" >&6; }
 #
 if test "x$FPP_TESTS_PASSED" = xno ; then
   as_fn_error $? "Found FC precompiler problems in processing FC source." "$LINENO" 5;
@@ -9127,12 +8540,11 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_F77+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_F77+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
 else
@@ -9140,15 +8552,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9159,11 +8567,11 @@ fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
-printf "%s\n" "$F77" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
+$as_echo "$F77" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9176,12 +8584,11 @@ if test -z "$F77"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_F77+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_F77+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
 else
@@ -9189,15 +8596,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9208,11 +8611,11 @@ fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
-printf "%s\n" "$ac_ct_F77" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9224,8 +8627,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     F77=$ac_ct_F77
@@ -9234,7 +8637,7 @@ fi
 
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -9244,7 +8647,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -9254,7 +8657,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 rm -f a.out
@@ -9263,12 +8666,11 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran 77" >&5
-printf %s "checking whether the compiler supports GNU Fortran 77... " >&6; }
-if test ${ac_cv_f77_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+if ${ac_cv_f77_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       program main
 #ifndef __GNUC__
@@ -9277,48 +8679,43 @@ else $as_nop
 
       end
 _ACEOF
-if ac_fn_f77_try_compile "$LINENO"
-then :
+if ac_fn_f77_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_f77_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+y}
+ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
-printf %s "checking whether $F77 accepts -g... " >&6; }
-if test ${ac_cv_prog_f77_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
+if ${ac_cv_prog_f77_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   FFLAGS=-g
 cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
-if ac_fn_f77_try_compile "$LINENO"
-then :
+if ac_fn_f77_try_compile "$LINENO"; then :
   ac_cv_prog_f77_g=yes
-else $as_nop
+else
   ac_cv_prog_f77_g=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
-printf "%s\n" "$ac_cv_prog_f77_g" >&6; }
-if test $ac_test_FFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
+if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
   if test "x$ac_cv_f77_compiler_gnu" = xyes; then
@@ -9344,24 +8741,23 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Fortran 77 compiler $F77 works" >&5
-printf %s "checking if Fortran 77 compiler $F77 works... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran 77 compiler $F77 works" >&5
+$as_echo_n "checking if Fortran 77 compiler $F77 works... " >&6; }
 
 cat > conftest.$ac_ext <<_ACEOF
       program main
        integer ierr
       end
 _ACEOF
-if ac_fn_f77_try_compile "$LINENO"
-then :
-  acx_f77_ok="yes"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-  acx_f77_ok="no"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; };
+if ac_fn_f77_try_compile "$LINENO"; then :
+  acx_f77_ok="yes"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  acx_f77_ok="no"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };
 as_fn_error $? "Fortran 77 compiler does not work. Impossible to continue." "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9397,8 +8793,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 mpibuild="yes"
 # Check whether --enable-mpi was given.
-if test ${enable_mpi+y}
-then :
+if test "${enable_mpi+set}" = set; then :
   enableval=$enable_mpi;
 fi
 
@@ -9428,12 +8823,11 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPIFC_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPIFC_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPIFC_test"; then
   ac_cv_prog_MPIFC_test="$MPIFC_test" # Let the user override the test.
 else
@@ -9441,15 +8835,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPIFC_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9460,11 +8850,11 @@ fi
 fi
 MPIFC_test=$ac_cv_prog_MPIFC_test
 if test -n "$MPIFC_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPIFC_test" >&5
-printf "%s\n" "$MPIFC_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIFC_test" >&5
+$as_echo "$MPIFC_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9473,13 +8863,12 @@ done
 test -n "$MPIFC_test" || MPIFC_test="$FC"
 
         else
-          as_ac_File=`printf "%s\n" "ac_cv_file_$MPIFC" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $MPIFC" >&5
-printf %s "checking for $MPIFC... " >&6; }
-if eval test \${$as_ac_File+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+          as_ac_File=`$as_echo "ac_cv_file_$MPIFC" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MPIFC" >&5
+$as_echo_n "checking for $MPIFC... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$MPIFC"; then
@@ -9489,22 +8878,20 @@ else
 fi
 fi
 eval ac_res=\$$as_ac_File
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   MPIFC_test=$MPIFC
-else $as_nop
+else
   for ac_prog in $MPIFC mpipgifort mpiifort mpifort mpiifx mpif90 mpxlf90 mpxlf mpf90 mpxlf95 mpxlf_r
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPIFC_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPIFC_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPIFC_test"; then
   ac_cv_prog_MPIFC_test="$MPIFC_test" # Let the user override the test.
 else
@@ -9512,15 +8899,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPIFC_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9531,11 +8914,11 @@ fi
 fi
 MPIFC_test=$ac_cv_prog_MPIFC_test
 if test -n "$MPIFC_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPIFC_test" >&5
-printf "%s\n" "$MPIFC_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIFC_test" >&5
+$as_echo "$MPIFC_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9551,23 +8934,22 @@ fi
 
 
 if test "$acx_mpi_ok" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MPI_Init" >&5
-printf %s "checking for MPI_Init... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init" >&5
+$as_echo_n "checking for MPI_Init... " >&6; }
                 cat > conftest.$ac_ext <<_ACEOF
       program main
       call MPI_init
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_mpi_ok="yes"
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
@@ -9587,11 +8969,10 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working mpif.h" >&5
-printf %s "checking for a working mpif.h... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working mpif.h" >&5
+$as_echo_n "checking for a working mpif.h... " >&6; }
   save_ldflags="$LDFLAGS"
-  if test "$LIB_MPI"
-then :
+  if test "$LIB_MPI"; then :
   LDFLAGS="${LDFLAGS} -L${LIB_MPI}"
 fi
   cat > conftest.$ac_ext <<_ACEOF
@@ -9602,23 +8983,21 @@ fi
   call MPI_Init(ierr)
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
-  HAVE_MPIF_H=1; acx_mpi_ok="yes"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-  HAVE_MPIF_H=0; acx_mpi_ok="no" ; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+if ac_fn_fc_try_compile "$LINENO"; then :
+  HAVE_MPIF_H=1; acx_mpi_ok="yes"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  HAVE_MPIF_H=0; acx_mpi_ok="no" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 if test "$acx_mpi_ok" = "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working mpi.h" >&5
-printf %s "checking for a working mpi.h... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working mpi.h" >&5
+$as_echo_n "checking for a working mpi.h... " >&6; }
   save_ldflags="$LDFLAGS"
-  if test "$LIB_MPI"
-then :
+  if test "$LIB_MPI"; then :
   LDFLAGS="${LDFLAGS} -L${LIB_MPI}"
 fi
   cat > conftest.$ac_ext <<_ACEOF
@@ -9629,22 +9008,20 @@ fi
   call MPI_Init(ierr)
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
-  HAVE_MPI_H=1; acx_mpi_ok="yes"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-  HAVE_MPI_H=0; acx_mpi_ok="no" ; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+if ac_fn_fc_try_compile "$LINENO"; then :
+  HAVE_MPI_H=1; acx_mpi_ok="yes"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  HAVE_MPI_H=0; acx_mpi_ok="no" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext;fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;fi
 
 if test "$acx_mpi_ok" = "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working mpi module" >&5
-printf %s "checking for a working mpi module... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working mpi module" >&5
+$as_echo_n "checking for a working mpi module... " >&6; }
   save_ldflags="$LDFLAGS"
-  if test "$LIB_MPI"
-then :
+  if test "$LIB_MPI"; then :
   LDFLAGS="${LDFLAGS} -L${LIB_MPI}"
 fi
   cat > conftest.$ac_ext <<_ACEOF
@@ -9655,15 +9032,14 @@ fi
   call MPI_Init(ierr)
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
-  HAVE_MPI_MOD=1; acx_mpi_ok="yes"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-  HAVE_MPI_MOD=0; acx_mpi_ok="no";  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+if ac_fn_fc_try_compile "$LINENO"; then :
+  HAVE_MPI_MOD=1; acx_mpi_ok="yes"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  HAVE_MPI_MOD=0; acx_mpi_ok="no";  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext;fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;fi
 
 #
 #
@@ -9675,12 +9051,12 @@ fi
 #
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "$acx_mpi_ok" = "no"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not compile a FORTRAN mpi test program. YAMBO serial only." >&5
-printf "%s\n" "$as_me: WARNING: could not compile a FORTRAN mpi test program. YAMBO serial only." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not compile a FORTRAN mpi test program. YAMBO serial only." >&5
+$as_echo "$as_me: WARNING: could not compile a FORTRAN mpi test program. YAMBO serial only." >&2;}
         :
 else
 
-printf "%s\n" "#define HAVE_MPI 1" >>confdefs.h
+$as_echo "#define HAVE_MPI 1" >>confdefs.h
 
         :
 fi
@@ -9711,13 +9087,12 @@ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 
 
         if ! test x"$MPIF77" = "x" ; then
-          as_ac_File=`printf "%s\n" "ac_cv_file_$MPIF77" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $MPIF77" >&5
-printf %s "checking for $MPIF77... " >&6; }
-if eval test \${$as_ac_File+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+          as_ac_File=`$as_echo "ac_cv_file_$MPIF77" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MPIF77" >&5
+$as_echo_n "checking for $MPIF77... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$MPIF77"; then
@@ -9727,22 +9102,20 @@ else
 fi
 fi
 eval ac_res=\$$as_ac_File
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   MPIF77_test=$MPIF77
-else $as_nop
+else
   for ac_prog in $MPIF77 $MPIFC mpipgifort mpiifort mpifort mpiifx mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPIF77_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPIF77_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPIF77_test"; then
   ac_cv_prog_MPIF77_test="$MPIF77_test" # Let the user override the test.
 else
@@ -9750,15 +9123,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPIF77_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9769,11 +9138,11 @@ fi
 fi
 MPIF77_test=$ac_cv_prog_MPIF77_test
 if test -n "$MPIF77_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPIF77_test" >&5
-printf "%s\n" "$MPIF77_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIF77_test" >&5
+$as_echo "$MPIF77_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9784,13 +9153,12 @@ test -n "$MPIF77_test" || MPIF77_test="$F77"
 fi
 
         elif ! test x"$MPIFC" = "x" ; then
-          as_ac_File=`printf "%s\n" "ac_cv_file_$MPIFC" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $MPIFC" >&5
-printf %s "checking for $MPIFC... " >&6; }
-if eval test \${$as_ac_File+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+          as_ac_File=`$as_echo "ac_cv_file_$MPIFC" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MPIFC" >&5
+$as_echo_n "checking for $MPIFC... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$MPIFC"; then
@@ -9800,22 +9168,20 @@ else
 fi
 fi
 eval ac_res=\$$as_ac_File
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   MPIF77_test=$MPIFC
-else $as_nop
+else
   for ac_prog in $MPIF77 $MPIFC mpipgifort mpiifort mpifort mpiifx mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPIF77_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPIF77_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPIF77_test"; then
   ac_cv_prog_MPIF77_test="$MPIF77_test" # Let the user override the test.
 else
@@ -9823,15 +9189,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPIF77_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9842,11 +9204,11 @@ fi
 fi
 MPIF77_test=$ac_cv_prog_MPIF77_test
 if test -n "$MPIF77_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPIF77_test" >&5
-printf "%s\n" "$MPIF77_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIF77_test" >&5
+$as_echo "$MPIF77_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9861,12 +9223,11 @@ fi
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPIF77_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPIF77_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPIF77_test"; then
   ac_cv_prog_MPIF77_test="$MPIF77_test" # Let the user override the test.
 else
@@ -9874,15 +9235,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPIF77_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9893,11 +9250,11 @@ fi
 fi
 MPIF77_test=$ac_cv_prog_MPIF77_test
 if test -n "$MPIF77_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPIF77_test" >&5
-printf "%s\n" "$MPIF77_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIF77_test" >&5
+$as_echo "$MPIF77_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9911,23 +9268,22 @@ test -n "$MPIF77_test" || MPIF77_test="$F77"
 
 
 if test "$acx_mpi_ok" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MPI_Init" >&5
-printf %s "checking for MPI_Init... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init" >&5
+$as_echo_n "checking for MPI_Init... " >&6; }
                 cat > conftest.$ac_ext <<_ACEOF
       program main
       call MPI_Init
       end
 _ACEOF
-if ac_fn_f77_try_link "$LINENO"
-then :
+if ac_fn_f77_try_link "$LINENO"; then :
   ac_mpi_ok="yes"
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -9963,12 +9319,12 @@ fi
 #
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "$acx_mpi_ok" = "no"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not compile a FORTRAN 77 mpi test program. YAMBO serial only." >&5
-printf "%s\n" "$as_me: WARNING: could not compile a FORTRAN 77 mpi test program. YAMBO serial only." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not compile a FORTRAN 77 mpi test program. YAMBO serial only." >&5
+$as_echo "$as_me: WARNING: could not compile a FORTRAN 77 mpi test program. YAMBO serial only." >&2;}
         :
 else
 
-printf "%s\n" "#define HAVE_MPI 1" >>confdefs.h
+$as_echo "#define HAVE_MPI 1" >>confdefs.h
 
         :
 fi
@@ -10004,12 +9360,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPICC_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPICC_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPICC_test"; then
   ac_cv_prog_MPICC_test="$MPICC_test" # Let the user override the test.
 else
@@ -10017,15 +9372,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPICC_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10036,11 +9387,11 @@ fi
 fi
 MPICC_test=$ac_cv_prog_MPICC_test
 if test -n "$MPICC_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPICC_test" >&5
-printf "%s\n" "$MPICC_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPICC_test" >&5
+$as_echo "$MPICC_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10049,13 +9400,12 @@ done
 test -n "$MPICC_test" || MPICC_test="$CC"
 
         else
-          as_ac_File=`printf "%s\n" "ac_cv_file_$MPICC" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $MPICC" >&5
-printf %s "checking for $MPICC... " >&6; }
-if eval test \${$as_ac_File+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+          as_ac_File=`$as_echo "ac_cv_file_$MPICC" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MPICC" >&5
+$as_echo_n "checking for $MPICC... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$MPICC"; then
@@ -10065,26 +9415,24 @@ else
 fi
 fi
 eval ac_res=\$$as_ac_File
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$MPICC" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$MPICC" | $as_tr_cpp` 1
 _ACEOF
 MPICC_test=$MPICC
-else $as_nop
+else
   for ac_prog in $MPICC mpipgicc mpiicc mpicc mpiicpx hcc mpcc mpcc_r mpxlc cmpicc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MPICC_test+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPICC_test+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$MPICC_test"; then
   ac_cv_prog_MPICC_test="$MPICC_test" # Let the user override the test.
 else
@@ -10092,15 +9440,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MPICC_test="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10111,11 +9455,11 @@ fi
 fi
 MPICC_test=$ac_cv_prog_MPICC_test
 if test -n "$MPICC_test"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPICC_test" >&5
-printf "%s\n" "$MPICC_test" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPICC_test" >&5
+$as_echo "$MPICC_test" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10132,8 +9476,7 @@ fi
 
 if test "$acx_mpi_ok" = "yes"; then
   ac_fn_c_check_func "$LINENO" "MPI_Init" "ac_cv_func_MPI_Init"
-if test "x$ac_cv_func_MPI_Init" = xyes
-then :
+if test "x$ac_cv_func_MPI_Init" = xyes; then :
   acx_mpi_ok="yes"
 fi
 
@@ -10148,8 +9491,8 @@ fi
 if test x"$MPICC" != x"mpipgicc" ; then
 echo > /dev/null
 if test "$acx_mpi_ok" = "no"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working mpi.h" >&5
-printf %s "checking for a working mpi.h... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working mpi.h" >&5
+$as_echo_n "checking for a working mpi.h... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10162,22 +9505,21 @@ printf %s "checking for a working mpi.h... " >&6; }
 #endif
 #endif
 int
-main (void)
+main ()
 {
 #include <mpi.h>
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; };acx_mpi_ok="yes"
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;acx_mpi_ok="no"
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };acx_mpi_ok="yes"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;acx_mpi_ok="no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 else
   acx_mpi_ok="yes"
@@ -10202,12 +9544,12 @@ fi
 #
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "$acx_mpi_ok" = "no"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not compile a C mpi test program. YAMBO serial only." >&5
-printf "%s\n" "$as_me: WARNING: could not compile a C mpi test program. YAMBO serial only." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not compile a C mpi test program. YAMBO serial only." >&5
+$as_echo "$as_me: WARNING: could not compile a C mpi test program. YAMBO serial only." >&2;}
         :
 else
 
-printf "%s\n" "#define HAVE_MPI 1" >>confdefs.h
+$as_echo "#define HAVE_MPI 1" >>confdefs.h
 
         :
 fi
@@ -10246,10 +9588,10 @@ if test -e "conftest.x"; then
 else
   MPIKIND="undefined"
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MPI version" >&5
-printf %s "checking for MPI version... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MPIKIND" >&5
-printf "%s\n" "$MPIKIND" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI version" >&5
+$as_echo_n "checking for MPI version... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIKIND" >&5
+$as_echo "$MPIKIND" >&6; }
 
 
   MPI_PATH=`which $CC |sed "s/bin\/$CC//g"`
@@ -10275,29 +9617,25 @@ fi
 
 
 # Check whether --with-mpi_libs was given.
-if test ${with_mpi_libs+y}
-then :
+if test "${with_mpi_libs+set}" = set; then :
   withval=$with_mpi_libs;
 fi
 
 
 # Check whether --with-mpi_path was given.
-if test ${with_mpi_path+y}
-then :
+if test "${with_mpi_path+set}" = set; then :
   withval=$with_mpi_path;
 fi
 
 
 # Check whether --with-mpi_libdir was given.
-if test ${with_mpi_libdir+y}
-then :
+if test "${with_mpi_libdir+set}" = set; then :
   withval=$with_mpi_libdir;
 fi
 
 
 # Check whether --with-mpi_includedir was given.
-if test ${with_mpi_includedir+y}
-then :
+if test "${with_mpi_includedir+set}" = set; then :
   withval=$with_mpi_includedir;
 fi
 
@@ -10373,13 +9711,12 @@ if test "$mpibuild" = "yes"; then
   if test x"$MPI_INC_DIR" = "x"  ; then
     for MPI_INC_DIR in $MPI_INC_DIRS_LIST; do
       if ! test -e "$MPI_INC_DIR"; then continue; fi
-      as_ac_File=`printf "%s\n" "ac_cv_file_$MPI_INC_DIR/mpif.h" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $MPI_INC_DIR/mpif.h" >&5
-printf %s "checking for $MPI_INC_DIR/mpif.h... " >&6; }
-if eval test \${$as_ac_File+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+      as_ac_File=`$as_echo "ac_cv_file_$MPI_INC_DIR/mpif.h" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MPI_INC_DIR/mpif.h" >&5
+$as_echo_n "checking for $MPI_INC_DIR/mpif.h... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$MPI_INC_DIR/mpif.h"; then
@@ -10389,12 +9726,11 @@ else
 fi
 fi
 eval ac_res=\$$as_ac_File
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   mpif_found_tmp="yes"
-else $as_nop
+else
   mpif_found_tmp="no"
 fi
 
@@ -10547,6 +9883,31 @@ url_ydb=https://github.com/yambo-code/ydb.git
 #
 
 
+#
+#        Copyright (C) 2000-2022 the YAMBO team
+#              http://www.yambo-code.org
+#
+# Authors (see AUTHORS file for details): AM
+#
+# This file is distributed under the terms of the GNU
+# General Public License. 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, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330,Boston,
+# MA 02111-1307, USA or visit http://www.gnu.org/copyleft/gpl.txt.
+#
+
+
 #
 #
 #        Copyright (C) 2000-2021 the YAMBO team
@@ -10610,8 +9971,7 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 #
 # Check whether --enable-ydb was given.
-if test ${enable_ydb+y}
-then :
+if test "${enable_ydb+set}" = set; then :
   enableval=$enable_ydb;
 fi
 
@@ -10625,12 +9985,11 @@ if test "x$enable_ydb" = "xyes"; then
  if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}git", so it can be a program name with args.
 set dummy ${ac_tool_prefix}git; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_GIT+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$GIT"; then
   ac_cv_prog_GIT="$GIT" # Let the user override the test.
 else
@@ -10638,15 +9997,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_GIT="${ac_tool_prefix}git"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10657,11 +10012,11 @@ fi
 fi
 GIT=$ac_cv_prog_GIT
 if test -n "$GIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
-printf "%s\n" "$GIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
+$as_echo "$GIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10670,12 +10025,11 @@ if test -z "$ac_cv_prog_GIT"; then
   ac_ct_GIT=$GIT
   # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_GIT+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_GIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_GIT"; then
   ac_cv_prog_ac_ct_GIT="$ac_ct_GIT" # Let the user override the test.
 else
@@ -10683,15 +10037,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_GIT="git"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10702,11 +10052,11 @@ fi
 fi
 ac_ct_GIT=$ac_cv_prog_ac_ct_GIT
 if test -n "$ac_ct_GIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GIT" >&5
-printf "%s\n" "$ac_ct_GIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GIT" >&5
+$as_echo "$ac_ct_GIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_GIT" = x; then
@@ -10714,8 +10064,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     GIT=$ac_ct_GIT
@@ -10727,14 +10077,14 @@ fi
  #
  if test  "$GIT" = "false"; then
   enable_ydb="no"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Git not found. Impossible to install YDB." >&5
-printf "%s\n" "$as_me: WARNING: Git not found. Impossible to install YDB." >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Git not found. Impossible to install YDB." >&5
+$as_echo "$as_me: WARNING: Git not found. Impossible to install YDB." >&2;}
  fi
  #
  if test "x$enable_ydb" = "xyes" && ! test -d "scripts/ydb"; then
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking YDB from $url_ydb" >&5
-printf %s "checking YDB from $url_ydb... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking YDB from $url_ydb" >&5
+$as_echo_n "checking YDB from $url_ydb... " >&6; }
   mkdir -p scripts
   git clone $url_ydb scripts/ydb
   #
@@ -10744,8 +10094,8 @@ printf %s "checking YDB from $url_ydb... " >&6; }
    cd $srcdir
   else
    enable_ydb="no"
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Impossible to install YDB." >&5
-printf "%s\n" "$as_me: WARNING: Impossible to install YDB." >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Impossible to install YDB." >&5
+$as_echo "$as_me: WARNING: Impossible to install YDB." >&2;}
   fi
  fi
  #
@@ -10759,19 +10109,17 @@ ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5
-printf %s "checking how to get verbose linking output from $F77... " >&6; }
-if test ${ac_cv_prog_f77_v+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5
+$as_echo_n "checking how to get verbose linking output from $F77... " >&6; }
+if ${ac_cv_prog_f77_v+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
-if ac_fn_f77_try_compile "$LINENO"
-then :
+if ac_fn_f77_try_compile "$LINENO"; then :
   ac_cv_prog_f77_v=
 # Try some options frequently used verbose output
 for ac_verb in -v -verbose --verbose -V -\#\#\#; do
@@ -10789,13 +10137,13 @@ ac_save_FFLAGS=$FFLAGS
 FFLAGS="$FFLAGS $ac_verb"
 eval "set x $ac_link"
 shift
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
 # LIBRARY_PATH; skip all such settings.
 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 |
   sed '/^Driving:/d; /^Configured with:/d;
       '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-printf "%s\n" "$ac_f77_v_output" >&5
+$as_echo "$ac_f77_v_output" >&5
 FFLAGS=$ac_save_FFLAGS
 
 rm -rf conftest*
@@ -10862,24 +10210,23 @@ esac
   done
 done
 if test -z "$ac_cv_prog_f77_v"; then
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5
-printf "%s\n" "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5
+$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;}
 fi
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
-printf "%s\n" "$as_me: WARNING: compilation failed" >&2;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
+$as_echo "$as_me: WARNING: compilation failed" >&2;}
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5
-printf "%s\n" "$ac_cv_prog_f77_v" >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5
-printf %s "checking for Fortran 77 libraries of $F77... " >&6; }
-if test ${ac_cv_f77_libs+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5
+$as_echo "$ac_cv_prog_f77_v" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5
+$as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; }
+if ${ac_cv_f77_libs+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test "x$FLIBS" != "x"; then
   ac_cv_f77_libs="$FLIBS" # Let the user override the test.
 else
@@ -10898,13 +10245,13 @@ ac_save_FFLAGS=$FFLAGS
 FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
 eval "set x $ac_link"
 shift
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
 # LIBRARY_PATH; skip all such settings.
 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 |
   sed '/^Driving:/d; /^Configured with:/d;
       '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-printf "%s\n" "$ac_f77_v_output" >&5
+$as_echo "$ac_f77_v_output" >&5
 FFLAGS=$ac_save_FFLAGS
 
 rm -rf conftest*
@@ -10981,10 +10328,9 @@ while test $# != 1; do
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
 fi
 	  ;;
@@ -10997,10 +10343,9 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   if test "$ac_compiler_gnu" = yes; then
   for ac_link_opt in $ac_arg; do
     ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt"
@@ -11015,24 +10360,9 @@ fi
 	  |-LANG:=* | -LIST:* | -LNO:* | -link)
 	  ;;
 	-lkernel32)
-	  # Ignore this library only on Windows-like systems.
 	  case $host_os in
-	  cygwin* | msys* ) ;;
-	  *)
-	    ac_exists=false
-  for ac_i in $ac_cv_f77_libs; do
-    if test x"$ac_arg" = x"$ac_i"; then
-      ac_exists=true
-      break
-    fi
-  done
-
-  if test x"$ac_exists" = xtrue
-then :
-
-else $as_nop
-  ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
-fi
+	  *cygwin*) ;;
+	  *) ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
 	    ;;
 	  esac
 	  ;;
@@ -11050,7 +10380,7 @@ fi
 	  esac
 	  ;;
 	-YP,*)
-	  for ac_j in `printf "%s\n" "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
+	  for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
 	      ac_exists=false
   for ac_i in $ac_cv_f77_libs; do
     if test x"$ac_j" = x"$ac_i"; then
@@ -11059,10 +10389,9 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   ac_arg="$ac_arg $ac_j"
 			       ac_cv_f77_libs="$ac_cv_f77_libs $ac_j"
 fi
@@ -11077,17 +10406,15 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue
-then :
+  if test x"$ac_exists" = xtrue; then :
 
-else $as_nop
+else
   ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
 fi
 	  ;;
 	-zallextract*| -zdefaultextract)
 	  ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
 	  ;;
-	-mllvm) ${2+shift};; # Defend against 'clang -mllvm -loopopt=0'.
 	  # Ignore everything else.
   esac
 done
@@ -11099,7 +10426,7 @@ set X $ac_save_positional; shift
 # must begin with a "/").
 case `(uname -sr) 2>/dev/null` in
    "SunOS 5"*)
-      ac_ld_run_path=`printf "%s\n" "$ac_f77_v_output" |
+      ac_ld_run_path=`$as_echo "$ac_f77_v_output" |
 			sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
       test "x$ac_ld_run_path" != x &&
 	if test "$ac_compiler_gnu" = yes; then
@@ -11114,8 +10441,8 @@ esac
 fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5
-printf "%s\n" "$ac_cv_f77_libs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5
+$as_echo "$ac_cv_f77_libs" >&6; }
 FLIBS="$ac_cv_f77_libs"
 
 
@@ -11131,20 +10458,17 @@ acx_blas_ok=no
 
 
 # Check whether --with-blas_libs was given.
-if test ${with_blas_libs+y}
-then :
+if test "${with_blas_libs+set}" = set; then :
   withval=$with_blas_libs;
 fi
 
 # Check whether --enable-int_linalg was given.
-if test ${enable_int_linalg+y}
-then :
+if test "${enable_int_linalg+set}" = set; then :
   enableval=$enable_int_linalg;
 fi
 
 # Check whether --enable-openmp_int_linalg was given.
-if test ${enable_openmp_int_linalg+y}
-then :
+if test "${enable_openmp_int_linalg+set}" = set; then :
   enableval=$enable_openmp_int_linalg;
 fi
 
@@ -11152,8 +10476,7 @@ fi
 BLAS_LIBS=""
 
 # Check whether --with-blas_libs was given.
-if test ${with_blas_libs+y}
-then :
+if test "${with_blas_libs+set}" = set; then :
   withval=$with_blas_libs;
 fi
 
@@ -11178,23 +10501,22 @@ internal_blas="no"
 if test $acx_blas_ok = no; then
 if test "x$BLAS_LIBS" != x; then
         save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in $BLAS_LIBS" >&5
-printf %s "checking for $caxpy in $BLAS_LIBS... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in $BLAS_LIBS" >&5
+$as_echo_n "checking for $caxpy in $BLAS_LIBS... " >&6; }
         cat > conftest.$ac_ext <<_ACEOF
       program main
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_blas_ok=yes
-else $as_nop
+else
   BLAS_LIBS=""
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acx_blas_ok" >&5
-printf "%s\n" "$acx_blas_ok" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_blas_ok" >&5
+$as_echo "$acx_blas_ok" >&6; }
         LIBS="$save_LIBS"
 fi
 fi
@@ -11203,10 +10525,9 @@ fi
 # BLAS linked to by default?  (happens on some supercomputers)
 if test $acx_blas_ok = no; then
         save_LIBS="$LIBS"; LIBS="$LIBS"
-        as_ac_var=`printf "%s\n" "ac_cv_func_$caxpy" | $as_tr_sh`
+        as_ac_var=`$as_echo "ac_cv_func_$caxpy" | $as_tr_sh`
 ac_fn_fc_check_func "$LINENO" "$caxpy" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"
-then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   acx_blas_ok=yes
 fi
 
@@ -11215,12 +10536,11 @@ fi
 
 # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
 if test $acx_blas_ok = no; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5
-printf %s "checking for ATL_xerbla in -latlas... " >&6; }
-if test ${ac_cv_lib_atlas_ATL_xerbla+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5
+$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; }
+if ${ac_cv_lib_atlas_ATL_xerbla+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-latlas  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11228,27 +10548,24 @@ cat > conftest.$ac_ext <<_ACEOF
       call ATL_xerbla
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   ac_cv_lib_atlas_ATL_xerbla=yes
-else $as_nop
+else
   ac_cv_lib_atlas_ATL_xerbla=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5
-printf "%s\n" "$ac_cv_lib_atlas_ATL_xerbla" >&6; }
-if test "x$ac_cv_lib_atlas_ATL_xerbla" = xyes
-then :
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_f77blas_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lf77blas" >&5
-printf %s "checking for $caxpy in -lf77blas... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5
+$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; }
+if test "x$ac_cv_lib_atlas_ATL_xerbla" = xyes; then :
+  as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lf77blas" >&5
+$as_echo_n "checking for $caxpy in -lf77blas... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lf77blas -latlas $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11256,27 +10573,24 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cblas_daxpy in -lcblas" >&5
-printf %s "checking for cblas_daxpy in -lcblas... " >&6; }
-if test ${ac_cv_lib_cblas_cblas_daxpy+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_daxpy in -lcblas" >&5
+$as_echo_n "checking for cblas_daxpy in -lcblas... " >&6; }
+if ${ac_cv_lib_cblas_cblas_daxpy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcblas -lf77blas -latlas $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11284,20 +10598,18 @@ cat > conftest.$ac_ext <<_ACEOF
       call cblas_daxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   ac_cv_lib_cblas_cblas_daxpy=yes
-else $as_nop
+else
   ac_cv_lib_cblas_cblas_daxpy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_daxpy" >&5
-printf "%s\n" "$ac_cv_lib_cblas_cblas_daxpy" >&6; }
-if test "x$ac_cv_lib_cblas_cblas_daxpy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_daxpy" >&5
+$as_echo "$ac_cv_lib_cblas_cblas_daxpy" >&6; }
+if test "x$ac_cv_lib_cblas_cblas_daxpy" = xyes; then :
   acx_blas_ok=yes
                          BLAS_LIBS="-lcblas -lf77blas -latlas"
 fi
@@ -11310,13 +10622,12 @@ fi
 
 # BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_blas_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lblas" >&5
-printf %s "checking for $caxpy in -lblas... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_blas_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lblas" >&5
+$as_echo_n "checking for $caxpy in -lblas... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lblas  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11324,28 +10635,25 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_daxpy_$daxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $daxpy in -ldaxpy" >&5
-printf %s "checking for $daxpy in -ldaxpy... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+  as_ac_Lib=`$as_echo "ac_cv_lib_daxpy_$daxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $daxpy in -ldaxpy" >&5
+$as_echo_n "checking for $daxpy in -ldaxpy... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldaxpy -lblas $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11353,28 +10661,25 @@ cat > conftest.$ac_ext <<_ACEOF
       call $daxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_caxpy_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lcaxpy" >&5
-printf %s "checking for $caxpy in -lcaxpy... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+  as_ac_Lib=`$as_echo "ac_cv_lib_caxpy_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lcaxpy" >&5
+$as_echo_n "checking for $caxpy in -lcaxpy... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcaxpy -lblas $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11382,21 +10687,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes; BLAS_LIBS="-lcaxpy -ldaxpy -lblas"
 fi
 
@@ -11408,13 +10711,12 @@ fi
 
 # BLAS in Alpha CXML library?
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_cxml_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lcxml" >&5
-printf %s "checking for $caxpy in -lcxml... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_cxml_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lcxml" >&5
+$as_echo_n "checking for $caxpy in -lcxml... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcxml  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11422,21 +10724,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes;BLAS_LIBS="-lcxml"
 fi
 
@@ -11444,13 +10744,12 @@ fi
 
 # BLAS in Alpha DXML library? (now called CXML, see above)
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_dxml_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -ldxml" >&5
-printf %s "checking for $caxpy in -ldxml... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_dxml_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -ldxml" >&5
+$as_echo_n "checking for $caxpy in -ldxml... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldxml  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11458,21 +10757,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes;BLAS_LIBS="-ldxml"
 fi
 
@@ -11481,12 +10778,11 @@ fi
 # BLAS in Sun Performance library?
 if test $acx_blas_ok = no; then
         if test "x$GCC" != xyes; then # only works with Sun CC
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5
-printf %s "checking for acosp in -lsunmath... " >&6; }
-if test ${ac_cv_lib_sunmath_acosp+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5
+$as_echo_n "checking for acosp in -lsunmath... " >&6; }
+if ${ac_cv_lib_sunmath_acosp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsunmath  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11494,27 +10790,24 @@ cat > conftest.$ac_ext <<_ACEOF
       call acosp
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   ac_cv_lib_sunmath_acosp=yes
-else $as_nop
+else
   ac_cv_lib_sunmath_acosp=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunmath_acosp" >&5
-printf "%s\n" "$ac_cv_lib_sunmath_acosp" >&6; }
-if test "x$ac_cv_lib_sunmath_acosp" = xyes
-then :
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_sunperf_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lsunperf" >&5
-printf %s "checking for $caxpy in -lsunperf... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunmath_acosp" >&5
+$as_echo "$ac_cv_lib_sunmath_acosp" >&6; }
+if test "x$ac_cv_lib_sunmath_acosp" = xyes; then :
+  as_ac_Lib=`$as_echo "ac_cv_lib_sunperf_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lsunperf" >&5
+$as_echo_n "checking for $caxpy in -lsunperf... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsunperf -lsunmath $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11522,21 +10815,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
                                  acx_blas_ok=yes
 fi
@@ -11548,13 +10839,12 @@ fi
 
 # BLAS in SCSL library?  (SGI/Cray Scientific Library)
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_scs_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lscs" >&5
-printf %s "checking for $caxpy in -lscs... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_scs_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lscs" >&5
+$as_echo_n "checking for $caxpy in -lscs... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lscs  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11562,21 +10852,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes; BLAS_LIBS="-lscs"
 fi
 
@@ -11584,13 +10872,12 @@ fi
 
 # BLAS in SGIMATH library?
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_complib.sgimath_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lcomplib.sgimath" >&5
-printf %s "checking for $caxpy in -lcomplib.sgimath... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_complib.sgimath_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lcomplib.sgimath" >&5
+$as_echo_n "checking for $caxpy in -lcomplib.sgimath... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcomplib.sgimath  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11598,21 +10885,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"
 fi
 
@@ -11620,13 +10905,12 @@ fi
 
 # BLAS in IBM ESSL library? (requires generic BLAS lib, too)
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_blas_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lblas" >&5
-printf %s "checking for $caxpy in -lblas... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_blas_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lblas" >&5
+$as_echo_n "checking for $caxpy in -lblas... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lblas  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11634,28 +10918,25 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_essl_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lessl" >&5
-printf %s "checking for $caxpy in -lessl... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+  as_ac_Lib=`$as_echo "ac_cv_lib_essl_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lessl" >&5
+$as_echo_n "checking for $caxpy in -lessl... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lessl -lblas $FLIBS $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11663,21 +10944,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"
 fi
 
@@ -11693,13 +10972,12 @@ if test $acx_blas_ok = no && test -d "${MKLROOT}" ; then
 	*gfortran* )
 		case "${host}" in
 		*x86*64*)
-			as_ac_Lib=`printf "%s\n" "ac_cv_lib_mkl_gf_lp64_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_gf_lp64" >&5
-printf %s "checking for $caxpy in -lmkl_gf_lp64... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+			as_ac_Lib=`$as_echo "ac_cv_lib_mkl_gf_lp64_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_gf_lp64" >&5
+$as_echo_n "checking for $caxpy in -lmkl_gf_lp64... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmkl_gf_lp64 -L${mkl_libdir} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11707,33 +10985,30 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes;BLAS_LIBS="-L${mkl_libdir} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
 fi
 
 		;;
 		i?86*linux*)
-			as_ac_Lib=`printf "%s\n" "ac_cv_lib_mkl_gf_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_gf" >&5
-printf %s "checking for $caxpy in -lmkl_gf... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+			as_ac_Lib=`$as_echo "ac_cv_lib_mkl_gf_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_gf" >&5
+$as_echo_n "checking for $caxpy in -lmkl_gf... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmkl_gf -L${mkl_libdir} -lmkl_gf -lmkl_sequential -lmkl_core -lpthread $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11741,21 +11016,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes;BLAS_LIBS="-L${mkl_libdir} -lmkl_gf -lmkl_sequential -lmkl_core -lpthread"
 fi
 
@@ -11767,13 +11040,12 @@ fi
 		# 64 bit
 		case "${host}" in
 		*x86*64*)
-			as_ac_Lib=`printf "%s\n" "ac_cv_lib_mkl_intel_lp64_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_intel_lp64" >&5
-printf %s "checking for $caxpy in -lmkl_intel_lp64... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+			as_ac_Lib=`$as_echo "ac_cv_lib_mkl_intel_lp64_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_intel_lp64" >&5
+$as_echo_n "checking for $caxpy in -lmkl_intel_lp64... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmkl_intel_lp64 -L${mkl_libdir} -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread -lm $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11781,33 +11053,30 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes;BLAS_LIBS="-L${mkl_libdir} -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread -lm"
 fi
 
 		;;
 		i?86*linux*)
-			as_ac_Lib=`printf "%s\n" "ac_cv_lib_mkl_intel_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_intel" >&5
-printf %s "checking for $caxpy in -lmkl_intel... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+			as_ac_Lib=`$as_echo "ac_cv_lib_mkl_intel_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lmkl_intel" >&5
+$as_echo_n "checking for $caxpy in -lmkl_intel... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmkl_intel -L${mkl_libdir} -lmkl_intel -lmkl_sequential -lmkl_core -lpthread $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11815,21 +11084,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes;BLAS_LIBS="-L${mkl_libdir} -lmkl_intel -lmkl_sequential -lmkl_core -lpthread"
 fi
 
@@ -11840,13 +11107,12 @@ fi
 
 # Generic BLAS library?
 if test $acx_blas_ok = no; then
-        as_ac_Lib=`printf "%s\n" "ac_cv_lib_blas_$caxpy" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lblas" >&5
-printf %s "checking for $caxpy in -lblas... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+        as_ac_Lib=`$as_echo "ac_cv_lib_blas_$caxpy" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $caxpy in -lblas" >&5
+$as_echo_n "checking for $caxpy in -lblas... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lblas  $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -11854,21 +11120,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $caxpy
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_blas_ok=yes; BLAS_LIBS="-lblas"
 fi
 
@@ -11879,7 +11143,7 @@ LIBS="$acx_blas_save_LIBS"
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test x"$acx_blas_ok" = xyes; then
 
-printf "%s\n" "#define HAVE_BLAS 1" >>confdefs.h
+$as_echo "#define HAVE_BLAS 1" >>confdefs.h
 
         :
 else
@@ -11889,12 +11153,12 @@ fi
 
 if test $acx_blas_ok = "no"; then
   internal_blas="yes";
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Could not find blas. Using the built-in library" >&5
-printf "%s\n" "$as_me: Could not find blas. Using the built-in library" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find blas. Using the built-in library" >&5
+$as_echo "$as_me: Could not find blas. Using the built-in library" >&6;}
 elif (test -d "$with_blas_libs" && test "$with_blas_libs" = "") || test x"$enable_int_linalg" = "xyes" ; then
   internal_blas="yes"
-  if test $acx_blas_ok = "yes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Blas found in ${BLAS_LIBS} but imposing built-in library" >&5
-printf "%s\n" "$as_me: Blas found in ${BLAS_LIBS} but imposing built-in library" >&6;}; fi
+  if test $acx_blas_ok = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: Blas found in ${BLAS_LIBS} but imposing built-in library" >&5
+$as_echo "$as_me: Blas found in ${BLAS_LIBS} but imposing built-in library" >&6;}; fi
 fi
 
 if test "$internal_blas" = "yes"; then
@@ -11959,12 +11223,11 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran 77 libraries" >&5
-printf %s "checking for dummy main to link with Fortran 77 libraries... " >&6; }
-if test ${ac_cv_f77_dummy_main+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran 77 libraries" >&5
+$as_echo_n "checking for dummy main to link with Fortran 77 libraries... " >&6; }
+if ${ac_cv_f77_dummy_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_f77_dm_save_LIBS=$LIBS
  LIBS="$LIBS $FLIBS"
  ac_fortran_dm_var=F77_DUMMY_MAIN
@@ -11995,20 +11258,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #endif
 #endif
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_fortran_dummy_main=none
-else $as_nop
+else
   ac_cv_fortran_dummy_main=unknown
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
  if test $ac_cv_fortran_dummy_main = unknown; then
@@ -12033,18 +11295,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 #endif
 #endif
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_fortran_dummy_main=$ac_func; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
    done
  fi
@@ -12057,24 +11318,25 @@ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
  LIBS=$ac_f77_dm_save_LIBS
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_dummy_main" >&5
-printf "%s\n" "$ac_cv_f77_dummy_main" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_dummy_main" >&5
+$as_echo "$ac_cv_f77_dummy_main" >&6; }
 F77_DUMMY_MAIN=$ac_cv_f77_dummy_main
-if test "$F77_DUMMY_MAIN" != unknown
-then :
+if test "$F77_DUMMY_MAIN" != unknown; then :
   if test $F77_DUMMY_MAIN != none; then
 
-printf "%s\n" "#define F77_DUMMY_MAIN $F77_DUMMY_MAIN" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define F77_DUMMY_MAIN $F77_DUMMY_MAIN
+_ACEOF
 
   if test "x$ac_cv_fc_dummy_main" = "x$ac_cv_f77_dummy_main"; then
 
-printf "%s\n" "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
+$as_echo "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
 
   fi
 fi
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "linking to Fortran libraries from C fails
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -12088,12 +11350,11 @@ ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 name-mangling scheme" >&5
-printf %s "checking for Fortran 77 name-mangling scheme... " >&6; }
-if test ${ac_cv_f77_mangling+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 name-mangling scheme" >&5
+$as_echo_n "checking for Fortran 77 name-mangling scheme... " >&6; }
+if ${ac_cv_f77_mangling+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat > conftest.$ac_ext <<_ACEOF
       subroutine foobar()
       return
@@ -12102,8 +11363,7 @@ else $as_nop
       return
       end
 _ACEOF
-if ac_fn_f77_try_compile "$LINENO"
-then :
+if ac_fn_f77_try_compile "$LINENO"; then :
   mv conftest.$ac_objext cfortran_test.$ac_objext
 
   ac_save_LIBS=$LIBS
@@ -12124,6 +11384,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char $ac_func ();
 #ifdef F77_DUMMY_MAIN
 
@@ -12142,18 +11405,17 @@ char $ac_func ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_success=yes; break 2
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     done
   done
@@ -12188,6 +11450,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char $ac_func ();
 #ifdef F77_DUMMY_MAIN
 
@@ -12206,18 +11471,17 @@ char $ac_func ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_success_extra=yes; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
      done
      ac_ext=f
@@ -12247,17 +11511,17 @@ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
   LIBS=$ac_save_LIBS
   rm -rf conftest*
   rm -f cfortran_test*
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compile a simple Fortran program
 See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_mangling" >&5
-printf "%s\n" "$ac_cv_f77_mangling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_mangling" >&5
+$as_echo "$ac_cv_f77_mangling" >&6; }
 
 ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
@@ -12271,8 +11535,7 @@ acx_lapack_ok=no
 LAPACK_LIBS=""
 
 # Check whether --with-lapack_libs was given.
-if test ${with_lapack_libs+y}
-then :
+if test "${with_lapack_libs+set}" = set; then :
   withval=$with_lapack_libs;
 fi
 
@@ -12298,23 +11561,22 @@ fi
 # First, check LAPACK_LIBS environment variable
 if test "x$LAPACK_LIBS" != x; then
         save_LIBS="$LIBS"; LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $cheev in $LAPACK_LIBS" >&5
-printf %s "checking for $cheev in $LAPACK_LIBS... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cheev in $LAPACK_LIBS" >&5
+$as_echo_n "checking for $cheev in $LAPACK_LIBS... " >&6; }
         cat > conftest.$ac_ext <<_ACEOF
       program main
       call $cheev
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_lapack_ok=yes
-else $as_nop
+else
   LAPACK_LIBS=""
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acx_lapack_ok" >&5
-printf "%s\n" "$acx_lapack_ok" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_lapack_ok" >&5
+$as_echo "$acx_lapack_ok" >&6; }
         LIBS="$save_LIBS"
         if test acx_lapack_ok = no; then
                 LAPACK_LIBS=""
@@ -12324,10 +11586,9 @@ fi
 # LAPACK linked to by default?  (is sometimes included in BLAS lib)
 if test $acx_lapack_ok = no; then
         save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS"
-        as_ac_var=`printf "%s\n" "ac_cv_func_$cheev" | $as_tr_sh`
+        as_ac_var=`$as_echo "ac_cv_func_$cheev" | $as_tr_sh`
 ac_fn_fc_check_func "$LINENO" "$cheev" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"
-then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   acx_lapack_ok=yes
 fi
 
@@ -12338,13 +11599,12 @@ fi
 for lapack in lapack lapack_rs6k; do
         if test $acx_lapack_ok = no; then
                 save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-                as_ac_Lib=`printf "%s\n" "ac_cv_lib_$lapack""_$cheev" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $cheev in -l$lapack" >&5
-printf %s "checking for $cheev in -l$lapack... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+                as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cheev in -l$lapack" >&5
+$as_echo_n "checking for $cheev in -l$lapack... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$lapack $FLIBS $LIBS"
 cat > conftest.$ac_ext <<_ACEOF
@@ -12352,21 +11612,19 @@ cat > conftest.$ac_ext <<_ACEOF
       call $cheev
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   acx_lapack_ok=yes; LAPACK_LIBS="-l$lapack"
 fi
 
@@ -12398,23 +11656,22 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
  if test "x$LAPACK_LIBS" != x; then
         save_LIBS="$LIBS"; LIBS="$LAPACK_LIBS"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $dlaran in $LAPACK_LIBS" >&5
-printf %s "checking for $dlaran in $LAPACK_LIBS... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dlaran in $LAPACK_LIBS" >&5
+$as_echo_n "checking for $dlaran in $LAPACK_LIBS... " >&6; }
         cat > conftest.$ac_ext <<_ACEOF
       program main
       call $dlaran
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_dlaran_ok=yes
-else $as_nop
+else
   acx_dlaran_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acx_dlaran_ok" >&5
-printf "%s\n" "$acx_dlaran_ok" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_dlaran_ok" >&5
+$as_echo "$acx_dlaran_ok" >&6; }
         LIBS="$save_LIBS"
  fi
 fi
@@ -12422,7 +11679,7 @@ fi
 # Execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test x"$acx_lapack_ok" = xyes; then
 
-printf "%s\n" "#define HAVE_LAPACK 1" >>confdefs.h
+$as_echo "#define HAVE_LAPACK 1" >>confdefs.h
 
         :
 else
@@ -12432,12 +11689,12 @@ fi
 
 if test $acx_lapack_ok = "no"; then
   internal_lapack="yes";
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Could not find lapack. Using the built-in library" >&5
-printf "%s\n" "$as_me: Could not find lapack. Using the built-in library" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find lapack. Using the built-in library" >&5
+$as_echo "$as_me: Could not find lapack. Using the built-in library" >&6;}
 elif (test -d  "$with_lapack_libs" && test "$with_lapack_libs" = "") || test x"$enable_int_linalg" = "xyes" ; then
   internal_lapack="yes"
-  if test "$acx_lalpack_ok" = "yes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Lapack found in ${LAPACK_LIBS} but imposing built-in library" >&5
-printf "%s\n" "$as_me: Lapack found in ${LAPACK_LIBS} but imposing built-in library" >&6;}; fi
+  if test "$acx_lalpack_ok" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: Lapack found in ${LAPACK_LIBS} but imposing built-in library" >&5
+$as_echo "$as_me: Lapack found in ${LAPACK_LIBS} but imposing built-in library" >&6;}; fi
 fi
 
 if test "$internal_lapack" = "yes"; then
@@ -12489,60 +11746,52 @@ fi
 
 
 # Check whether --with-fft_libs was given.
-if test ${with_fft_libs+y}
-then :
+if test "${with_fft_libs+set}" = set; then :
   withval=$with_fft_libs;
 fi
 
 
 # Check whether --with-fft_path was given.
-if test ${with_fft_path+y}
-then :
+if test "${with_fft_path+set}" = set; then :
   withval=$with_fft_path;
 fi
 
 
 # Check whether --with-fft_libdir was given.
-if test ${with_fft_libdir+y}
-then :
+if test "${with_fft_libdir+set}" = set; then :
   withval=$with_fft_libdir;
 fi
 
 
 # Check whether --with-fft_includedir was given.
-if test ${with_fft_includedir+y}
-then :
+if test "${with_fft_includedir+set}" = set; then :
   withval=$with_fft_includedir;
 fi
 
 #
 # Check whether --enable-internal_fftqe was given.
-if test ${enable_internal_fftqe+y}
-then :
+if test "${enable_internal_fftqe+set}" = set; then :
   enableval=$enable_internal_fftqe;
-else $as_nop
+else
   enable_internal_fftqe=no
 fi
 
 # Check whether --enable-internal_fftsg was given.
-if test ${enable_internal_fftsg+y}
-then :
+if test "${enable_internal_fftsg+set}" = set; then :
   enableval=$enable_internal_fftsg;
-else $as_nop
+else
   enable_internal_fftsg=no
 fi
 
 # Check whether --enable-3d_fft was given.
-if test ${enable_3d_fft+y}
-then :
+if test "${enable_3d_fft+set}" = set; then :
   enableval=$enable_3d_fft;
 fi
 
 #
 
 # Check whether --with-fftsg_fac was given.
-if test ${with_fftsg_fac+y}
-then :
+if test "${with_fftsg_fac+set}" = set; then :
   withval=$with_fftsg_fac;
 fi
 
@@ -12567,10 +11816,10 @@ if test -d "$with_fft_path" || test -d "$with_fft_libdir" ; then
   #
   # external FFT
   #
-  if test -d "$with_fft_path" ;   then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFT in $with_fft_path" >&5
-printf %s "checking for FFT in $with_fft_path... " >&6; } ; fi
-  if test -d "$with_fft_libdir" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFT in $with_fft_libdir" >&5
-printf %s "checking for FFT in $with_fft_libdir... " >&6; } ; fi
+  if test -d "$with_fft_path" ;   then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFT in $with_fft_path" >&5
+$as_echo_n "checking for FFT in $with_fft_path... " >&6; } ; fi
+  if test -d "$with_fft_libdir" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFT in $with_fft_libdir" >&5
+$as_echo_n "checking for FFT in $with_fft_libdir... " >&6; } ; fi
   #
   if test -d "$with_fft_path" ; then
     try_fft_libdir=$with_fft_path/lib
@@ -12586,16 +11835,16 @@ elif test x"$with_fft_libs" != "x" ; then
   #
   # directly provided lib
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFT Library using $with_fft_libs" >&5
-printf %s "checking for FFT Library using $with_fft_libs... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFT Library using $with_fft_libs" >&5
+$as_echo_n "checking for FFT Library using $with_fft_libs... " >&6; }
   try_fft_libs=$with_fft_libs
   #
   if test -d "$with_fft_includedir" ; then try_fft_incdir=$with_fft_includedir ; fi
   if test -z "$try_fft_incdir" ; then include_warn="yes" ; fi
   #
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFT" >&5
-printf %s "checking for FFT... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFT" >&5
+$as_echo_n "checking for FFT... " >&6; }
 fi
 #
 # check for FFTW
@@ -12658,24 +11907,22 @@ if ! test x"$try_fft_libs" = "x" ; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   HAVE_FFTW="yes";
-else $as_nop
+else
   HAVE_FFTW="no";
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   cat > conftest.$ac_ext <<_ACEOF
 $testprog_omp
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   HAVE_FFTW_OMP="yes";
-else $as_nop
+else
   HAVE_FFTW_OMP="no";
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   #
   LIBS=$save_libs
@@ -12687,18 +11934,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     #
     if test "$try_fft_libs" = "-lfftw3" ; then
       FFT_info="(FFTW v3)";
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FFTW3" >&5
-printf "%s\n" "FFTW3" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: FFTW3" >&5
+$as_echo "FFTW3" >&6; }
     elif test "$try_fft_libs" = "-lfftw3 -lfftw3_omp" && test "$HAVE_FFTW_OMP" = "yes" ; then
       FFT_info="(FFTW_OMP v3)";
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FFTW3_OMP" >&5
-printf "%s\n" "FFTW3_OMP" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: FFTW3_OMP" >&5
+$as_echo "FFTW3_OMP" >&6; }
     else
       desc=Other
       if ! test -z "`echo $try_fft_libs | grep -i mkl`" ; then desc="MKL" ; fi
       FFT_info="(FFTW $desc)";
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FFTW ($desc) " >&5
-printf "%s\n" "FFTW ($desc) " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: FFTW ($desc) " >&5
+$as_echo "FFTW ($desc) " >&6; }
     fi
   else
     def_fft=""
@@ -12713,8 +11960,8 @@ else
 fi
 
 if test "$HAVE_FFT" = "yes" && test "$include_warn" = "yes" ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No include-dir specified for fft library" >&5
-printf "%s\n" "$as_me: WARNING: No include-dir specified for fft library" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No include-dir specified for fft library" >&5
+$as_echo "$as_me: WARNING: No include-dir specified for fft library" >&2;}
 fi
 #
 # check for ESSL FFT
@@ -12724,8 +11971,8 @@ if test -d "$try_fft_libdir" && test -d "$try_fft_incdir" ; then
 fi
 #
 if ! test x"$try_fft_libs" = "x" && ! test "$HAVE_FFT" = "yes" ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FFTW no" >&5
-printf "%s\n" "FFTW no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: FFTW no" >&5
+$as_echo "FFTW no" >&6; }
   #
   if ! test x"$try_fft_libdir" = "x" ; then FFT_PATH="-L$try_fft_libdir" ; fi
   #
@@ -12735,31 +11982,30 @@ printf "%s\n" "FFTW no" >&6; }
   LIBS="$FFT_PATH $try_fft_libs"
   if test x"$try_fft_incdir" != "x" ; then FCFLAGS="$FCFLAGS $IFLAG$try_fft_incdir" ; fi
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dcft in $LIBS" >&5
-printf %s "checking for dcft in $LIBS... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcft in $LIBS" >&5
+$as_echo_n "checking for dcft in $LIBS... " >&6; }
   cat > conftest.$ac_ext <<_ACEOF
       program main
       call dcft
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   HAVE_ESSL=yes
-else $as_nop
+else
   HAVE_ESSL=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAVE_ESSL" >&5
-printf "%s\n" "$HAVE_ESSL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_ESSL" >&5
+$as_echo "$HAVE_ESSL" >&6; }
   #
   LIBS=$save_libs
   LDFLAGS=$save_ldflags
   FCFLAGS=$save_fcflags
   #
   if test "$HAVE_ESSL" = "yes" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFT" >&5
-printf %s "checking for FFT... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFT" >&5
+$as_echo_n "checking for FFT... " >&6; }
     if ! test x"$enable_3d_fft" = "xno" ; then
       FFT3D_CPP="-D_USE_3D_FFT"
       FFT_info="(FFT ESSL (FFTQE) with 3D support)";
@@ -12771,8 +12017,8 @@ printf %s "checking for FFT... " >&6; }
     FFT_INCS="$IFLAG$try_fft_incdir"
     HAVE_FFT=yes
     compile_fftqe=yes
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ESSL FFT" >&5
-printf "%s\n" "ESSL FFT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ESSL FFT" >&5
+$as_echo "ESSL FFT" >&6; }
   fi
 fi
 #
@@ -12781,8 +12027,8 @@ fi
 if ! test x"$HAVE_FFT" = "xyes" ; then
    #
   #
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFT" >&5
-printf %s "checking for FFT... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFT" >&5
+$as_echo_n "checking for FFT... " >&6; }
    if test x"$enable_internal_fftqe" = "xyes" ; then
       use_internal_fftqe=yes
       use_internal_fftsg=no
@@ -12819,8 +12065,8 @@ if test "$use_internal_fftqe" = "yes" ; then
   else
     compile_fftqe=yes
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Internal FFTQE (FFTW2)" >&5
-printf "%s\n" "Internal FFTQE (FFTW2)" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Internal FFTQE (FFTW2)" >&5
+$as_echo "Internal FFTQE (FFTW2)" >&6; }
 fi
 if test "$HAVE_FFTQE" = "yes" ; then HAVE_FFT=yes ; fi
 
@@ -12846,8 +12092,8 @@ if test "$use_internal_fftsg" = "yes" ; then
   FFT_LIBS=""
   HAVE_FFTSG=yes;
   internal_fft="yes";
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FFTSG" >&5
-printf "%s\n" "FFTSG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: FFTSG" >&5
+$as_echo "FFTSG" >&6; }
 
 fi
 if test "$HAVE_FFTSG" = "yes" ; then HAVE_FFT=yes ; fi
@@ -12868,8 +12114,8 @@ if test "$use_internal_fftw" = "yes" ; then
   else
     compile_fftw=yes
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Internal FFTW3" >&5
-printf "%s\n" "Internal FFTW3" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Internal FFTW3" >&5
+$as_echo "Internal FFTW3" >&6; }
 fi
 if test "$HAVE_FFTW" = "yes" ; then HAVE_FFT=yes ; fi
 
@@ -12883,48 +12129,48 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 case $ac_cv_f77_mangling in
   "lower case, no underscore, no extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) name" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) name" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) name" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) name" >>confdefs.h
  ;;
   "lower case, no underscore, extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) name" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) name" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) name ## _" >>confdefs.h
  ;;
   "lower case, underscore, no extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) name ## _" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) name ## _" >>confdefs.h
  ;;
   "lower case, underscore, extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) name ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) name ## _" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) name ## __" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) name ## __" >>confdefs.h
  ;;
   "upper case, no underscore, no extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) NAME" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) NAME" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) NAME" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) NAME" >>confdefs.h
  ;;
   "upper case, no underscore, extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) NAME" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) NAME" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) NAME ## _" >>confdefs.h
  ;;
   "upper case, underscore, no extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) NAME ## _" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) NAME ## _" >>confdefs.h
  ;;
   "upper case, underscore, extra underscore")
-	  printf "%s\n" "#define F77_FUNC(name,NAME) NAME ## _" >>confdefs.h
+	  $as_echo "#define F77_FUNC(name,NAME) NAME ## _" >>confdefs.h
 
-	  printf "%s\n" "#define F77_FUNC_(name,NAME) NAME ## __" >>confdefs.h
+	  $as_echo "#define F77_FUNC_(name,NAME) NAME ## __" >>confdefs.h
  ;;
   *)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
-printf "%s\n" "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
+$as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
 	  ;;
 esac
 
@@ -12933,7 +12179,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
-    printf "%s\n" "#define _FFTQE 1" >>confdefs.h
+    $as_echo "#define _FFTQE 1" >>confdefs.h
 
     ac_config_headers="$ac_config_headers lib/fftqe/c_defs.h:lib/fftqe/c_defs.h.in"
 
@@ -12955,99 +12201,86 @@ fi
 
 #
 # Check whether --enable-slepc_linalg was given.
-if test ${enable_slepc_linalg+y}
-then :
+if test "${enable_slepc_linalg+set}" = set; then :
   enableval=$enable_slepc_linalg;
 fi
 
 #
 
 # Check whether --with-slepc_libs was given.
-if test ${with_slepc_libs+y}
-then :
+if test "${with_slepc_libs+set}" = set; then :
   withval=$with_slepc_libs;
 fi
 
 
 # Check whether --with-slepc_incs was given.
-if test ${with_slepc_incs+y}
-then :
+if test "${with_slepc_incs+set}" = set; then :
   withval=$with_slepc_incs;
 fi
 
 
 # Check whether --with-slepc_path was given.
-if test ${with_slepc_path+y}
-then :
+if test "${with_slepc_path+set}" = set; then :
   withval=$with_slepc_path;
 fi
 
 
 # Check whether --with-slepc_libdir was given.
-if test ${with_slepc_libdir+y}
-then :
+if test "${with_slepc_libdir+set}" = set; then :
   withval=$with_slepc_libdir;
 fi
 
 
 # Check whether --with-slepc_includedir was given.
-if test ${with_slepc_includedir+y}
-then :
+if test "${with_slepc_includedir+set}" = set; then :
   withval=$with_slepc_includedir;
 fi
 
 #
 
 # Check whether --with-petsc_libs was given.
-if test ${with_petsc_libs+y}
-then :
+if test "${with_petsc_libs+set}" = set; then :
   withval=$with_petsc_libs;
 fi
 
 
 # Check whether --with-petsc_incs was given.
-if test ${with_petsc_incs+y}
-then :
+if test "${with_petsc_incs+set}" = set; then :
   withval=$with_petsc_incs;
 fi
 
 
 # Check whether --with-petsc_path was given.
-if test ${with_petsc_path+y}
-then :
+if test "${with_petsc_path+set}" = set; then :
   withval=$with_petsc_path;
 fi
 
 
 # Check whether --with-petsc_libdir was given.
-if test ${with_petsc_libdir+y}
-then :
+if test "${with_petsc_libdir+set}" = set; then :
   withval=$with_petsc_libdir;
 fi
 
 
 # Check whether --with-petsc_includedir was given.
-if test ${with_petsc_includedir+y}
-then :
+if test "${with_petsc_includedir+set}" = set; then :
   withval=$with_petsc_includedir;
 fi
 
 
 
 # Check whether --with-slepc-branch was given.
-if test ${with_slepc_branch+y}
-then :
+if test "${with_slepc_branch+set}" = set; then :
   withval=$with_slepc_branch;
-else $as_nop
+else
   with_slepc_branch=none
 fi
 
 
 # Check whether --with-petsc-branch was given.
-if test ${with_petsc_branch+y}
-then :
+if test "${with_petsc_branch+set}" = set; then :
   withval=$with_petsc_branch;
-else $as_nop
+else
   with_petsc_branch=none
 fi
 
@@ -13070,12 +12303,11 @@ 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
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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 :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13084,6 +12316,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dlopen ();
 #ifdef F77_DUMMY_MAIN
 
@@ -13102,29 +12337,27 @@ char dlopen ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else $as_nop
+else
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $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 :
   use_libdl="yes";
-else $as_nop
+else
   use_libdl="no";
 fi
 
@@ -13159,12 +12392,12 @@ if test -d "$with_petsc_path" || test -d "$with_petsc_libdir" || test x"$with_pe
   #
   # external petsc
   #
-  if   test   x"$with_petsc_libs" != "x" ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Petsc using $with_petsc_libs" >&5
-printf %s "checking for Petsc using $with_petsc_libs... " >&6; } ;
-  elif test -d "$with_petsc_libdir"      ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Petsc in $with_petsc_libdir" >&5
-printf %s "checking for Petsc in $with_petsc_libdir... " >&6; } ;
-  elif test -d "$with_petsc_path"        ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Petsc in $with_petsc_path" >&5
-printf %s "checking for Petsc in $with_petsc_path... " >&6; } ;
+  if   test   x"$with_petsc_libs" != "x" ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Petsc using $with_petsc_libs" >&5
+$as_echo_n "checking for Petsc using $with_petsc_libs... " >&6; } ;
+  elif test -d "$with_petsc_libdir"      ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Petsc in $with_petsc_libdir" >&5
+$as_echo_n "checking for Petsc in $with_petsc_libdir... " >&6; } ;
+  elif test -d "$with_petsc_path"        ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Petsc in $with_petsc_path" >&5
+$as_echo_n "checking for Petsc in $with_petsc_path... " >&6; } ;
   fi
   #
   if test -d "$with_petsc_path" ; then
@@ -13207,24 +12440,23 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 #include <petsc/finclude/petscvec.h>
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   petsc=yes
-else $as_nop
+else
   petsc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
   #
   if test "x$petsc" = "xyes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;
     PETSC_INCS="$try_PETSC_INCS" ;
     PETSC_LIBS="$try_PETSC_LIBS" ;
     compile_petsc="no";
     internal_petsc="no";
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;
     #
   fi
   #
@@ -13237,8 +12469,8 @@ if test "x$enable_petsc" = "xyes" && test "x$petsc" = "xno" ; then
   #
   # internal petsc
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal Petsc library" >&5
-printf %s "checking for internal Petsc library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal Petsc library" >&5
+$as_echo_n "checking for internal Petsc library... " >&6; }
   #
   internal_petsc="yes"
   #
@@ -13258,30 +12490,30 @@ printf %s "checking for internal Petsc library... " >&6; }
     PETSC_LIBS="$PETSC_LIBS_DN" ;
     compile_petsc="no" ;
     if test "x$lapack_shared" = "x1" ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: dynamic already compiled" >&5
-printf "%s\n" "dynamic already compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic already compiled" >&5
+$as_echo "dynamic already compiled" >&6; } ;
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: dynamic found, despite no dynamic lapack detected." >&5
-printf "%s\n" "dynamic found, despite no dynamic lapack detected." >&6; } ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: The compilation may fail. In case remove the dynamic petsc libs." >&5
-printf "%s\n" "The compilation may fail. In case remove the dynamic petsc libs." >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic found, despite no dynamic lapack detected." >&5
+$as_echo "dynamic found, despite no dynamic lapack detected." >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: The compilation may fail. In case remove the dynamic petsc libs." >&5
+$as_echo "The compilation may fail. In case remove the dynamic petsc libs." >&6; } ;
     fi
   elif test -e "$PETSC_LIBS_ST" ; then
     PETSC_LIBS="$PETSC_LIBS_ST" ;
     compile_petsc="no" ;
     if test "x$lapack_shared" = "x1" ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: static found, despite dynamic lapack." >&5
-printf "%s\n" "static found, despite dynamic lapack." >&6; } ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: You may delete the static petsc and re-run the configure to get smaller executables" >&5
-printf "%s\n" "You may delete the static petsc and re-run the configure to get smaller executables" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: static found, despite dynamic lapack." >&5
+$as_echo "static found, despite dynamic lapack." >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: You may delete the static petsc and re-run the configure to get smaller executables" >&5
+$as_echo "You may delete the static petsc and re-run the configure to get smaller executables" >&6; } ;
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: static already compiled" >&5
-printf "%s\n" "static already compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: static already compiled" >&5
+$as_echo "static already compiled" >&6; } ;
     fi
   else
     compile_petsc="yes" ;
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; } ;
   fi
   #
 fi
@@ -13308,12 +12540,12 @@ if test -d "$with_slepc_path" || test -d "$with_slec_libdir" || test x"$with_sle
   #
   # external slepc
   #
-  if   test   x"$with_slepc_libs" != "x" ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Slepc using $with_slepc_libs" >&5
-printf %s "checking for Slepc using $with_slepc_libs... " >&6; } ;
-  elif test -d "$with_slepc_libdir"      ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Slepc in $with_slepc_libdir" >&5
-printf %s "checking for Slepc in $with_slepc_libdir... " >&6; } ;
-  elif test -d "$with_slepc_path"        ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Slepc in $with_slepc_path" >&5
-printf %s "checking for Slepc in $with_slepc_path... " >&6; } ;
+  if   test   x"$with_slepc_libs" != "x" ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Slepc using $with_slepc_libs" >&5
+$as_echo_n "checking for Slepc using $with_slepc_libs... " >&6; } ;
+  elif test -d "$with_slepc_libdir"      ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Slepc in $with_slepc_libdir" >&5
+$as_echo_n "checking for Slepc in $with_slepc_libdir... " >&6; } ;
+  elif test -d "$with_slepc_path"        ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Slepc in $with_slepc_path" >&5
+$as_echo_n "checking for Slepc in $with_slepc_path... " >&6; } ;
   fi
   #
   if test -d "$with_slepc_path" ; then
@@ -13352,25 +12584,24 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 #include <slepc/finclude/slepceps.h>
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   slepc=yes
-else $as_nop
+else
   slepc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
   #
   if test "x$slepc" = "xyes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;
     SLEPC_INCS="$try_SLEPC_INCS" ;
     SLEPC_LIBS="$try_SLEPC_LIBS" ;
     compile_slepc="no";
     internal_slepc="no";
     def_slepc="-D_SLEPC";
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;
     #
   fi
   #
@@ -13384,8 +12615,8 @@ if test "x$enable_slepc" = "xyes" && test "x$slepc" = "xno" && test "x$enable_pe
   #
   # internal slepc
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal Slepc library" >&5
-printf %s "checking for internal Slepc library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal Slepc library" >&5
+$as_echo_n "checking for internal Slepc library... " >&6; }
   #
   internal_slepc="yes";
   #
@@ -13403,30 +12634,30 @@ printf %s "checking for internal Slepc library... " >&6; }
     SLEPC_LIBS="$SLEPC_LIBS_DN -Wl,-rpath=${extlibs_path}/${FCKIND}/${FC}/${build_precision}/lib" ;
     compile_slepc="no" ;
     if test "x$lapack_shared" = "x1" ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: dynamic already compiled" >&5
-printf "%s\n" "dynamic already compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic already compiled" >&5
+$as_echo "dynamic already compiled" >&6; } ;
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: dynamic found, despite no dynamic lapack detected." >&5
-printf "%s\n" "dynamic found, despite no dynamic lapack detected." >&6; } ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: The compilation may fail. In case remove the dynamic slepc libs." >&5
-printf "%s\n" "The compilation may fail. In case remove the dynamic slepc libs." >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic found, despite no dynamic lapack detected." >&5
+$as_echo "dynamic found, despite no dynamic lapack detected." >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: The compilation may fail. In case remove the dynamic slepc libs." >&5
+$as_echo "The compilation may fail. In case remove the dynamic slepc libs." >&6; } ;
     fi
   elif test -e "$SLEPC_LIBS_ST" ; then
     SLEPC_LIBS="$SLEPC_LIBS_ST" ;
     compile_slepc="no" ;
     if test "x$lapack_shared" = "x1" ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: static found, despite dynamic lapack." >&5
-printf "%s\n" "static found, despite dynamic lapack." >&6; } ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: You may delete the static slepc and re-run the configure to get smaller executables" >&5
-printf "%s\n" "You may delete the static slepc and re-run the configure to get smaller executables" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: static found, despite dynamic lapack." >&5
+$as_echo "static found, despite dynamic lapack." >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: You may delete the static slepc and re-run the configure to get smaller executables" >&5
+$as_echo "You may delete the static slepc and re-run the configure to get smaller executables" >&6; } ;
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: static already compiled" >&5
-printf "%s\n" "static already compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: static already compiled" >&5
+$as_echo "static already compiled" >&6; } ;
     fi
   else
     compile_slepc="yes" ;
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; } ;
   fi
   def_slepc="-D_SLEPC";
   #
@@ -13452,22 +12683,19 @@ fi
 
 
 # Check whether --enable-par_linalg was given.
-if test ${enable_par_linalg+y}
-then :
+if test "${enable_par_linalg+set}" = set; then :
   enableval=$enable_par_linalg;
 fi
 
 
 # Check whether --with-blacs_libs was given.
-if test ${with_blacs_libs+y}
-then :
+if test "${with_blacs_libs+set}" = set; then :
   withval=$with_blacs_libs;
 fi
 
 
 # Check whether --with-scalapack_libs was given.
-if test ${with_scalapack_libs+y}
-then :
+if test "${with_scalapack_libs+set}" = set; then :
   withval=$with_scalapack_libs;
 fi
 
@@ -13554,23 +12782,22 @@ if test "$mpibuild"  = "yes"; then
     # First, check BLACS_LIBS environment variable
     if test "x$BLACS_LIBS" != x; then
       save_LIBS="$LIBS"; LIBS="$BLACS_LIBS $LIBS"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $blacs_routine in $BLACS_LIBS" >&5
-printf %s "checking for $blacs_routine in $BLACS_LIBS... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $blacs_routine in $BLACS_LIBS" >&5
+$as_echo_n "checking for $blacs_routine in $BLACS_LIBS... " >&6; }
       cat > conftest.$ac_ext <<_ACEOF
       program main
       call $blacs_routine
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   enable_blacs="yes"
-else $as_nop
+else
   enable_blacs="internal"; BLACS_LIBS=""
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_blacs" >&5
-printf "%s\n" "$enable_blacs" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_blacs" >&5
+$as_echo "$enable_blacs" >&6; }
       BLACS_LIBS="$acx_blacs_save_LIBS"
       LIBS="$save_LIBS"
     else
@@ -13585,23 +12812,22 @@ printf "%s\n" "$enable_blacs" >&6; }
     # First, check SCALAPACK_LIBS environment variable
     if test "x$SCALAPACK_LIBS" != x; then
       save_LIBS="$LIBS"; LIBS="$SCALAPACK_LIBS $LIBS"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $scalapack_routine in $SCALAPACK_LIBS" >&5
-printf %s "checking for $scalapack_routine in $SCALAPACK_LIBS... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $scalapack_routine in $SCALAPACK_LIBS" >&5
+$as_echo_n "checking for $scalapack_routine in $SCALAPACK_LIBS... " >&6; }
       cat > conftest.$ac_ext <<_ACEOF
       program main
       call $scalapack_routine
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   enable_scalapack="yes"
-else $as_nop
+else
   enable_scalapack="internal"; SCALAPACK_LIBS=""
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_scalapack" >&5
-printf "%s\n" "$enable_scalapack" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_scalapack" >&5
+$as_echo "$enable_scalapack" >&6; }
       SCALAPACK_LIBS="$acx_scalapack_save_LIBS"
       LIBS="$save_LIBS"
     else
@@ -13675,29 +12901,25 @@ LIBS="$reset_LIBS"
 #
 
 # Check whether --with-hdf5_libs was given.
-if test ${with_hdf5_libs+y}
-then :
+if test "${with_hdf5_libs+set}" = set; then :
   withval=$with_hdf5_libs;
 fi
 
 
 # Check whether --with-hdf5_path was given.
-if test ${with_hdf5_path+y}
-then :
+if test "${with_hdf5_path+set}" = set; then :
   withval=$with_hdf5_path;
 fi
 
 
 # Check whether --with-hdf5_libdir was given.
-if test ${with_hdf5_libdir+y}
-then :
+if test "${with_hdf5_libdir+set}" = set; then :
   withval=$with_hdf5_libdir;
 fi
 
 
 # Check whether --with-hdf5_includedir was given.
-if test ${with_hdf5_includedir+y}
-then :
+if test "${with_hdf5_includedir+set}" = set; then :
   withval=$with_hdf5_includedir;
 fi
 
@@ -13705,8 +12927,7 @@ fi
 # HDF5 data compression
 #
 # Check whether --enable-hdf5_compression was given.
-if test ${enable_hdf5_compression+y}
-then :
+if test "${enable_hdf5_compression+set}" = set; then :
   enableval=$enable_hdf5_compression;
 fi
 
@@ -13714,10 +12935,9 @@ fi
 # HDF5 PAR IO
 #
 # Check whether --enable-hdf5_par_io was given.
-if test ${enable_hdf5_par_io+y}
-then :
+if test "${enable_hdf5_par_io+set}" = set; then :
   enableval=$enable_hdf5_par_io;
-else $as_nop
+else
   enable_hdf5_par_io="yes"
 fi
 
@@ -13725,8 +12945,7 @@ fi
 # HDF5 FOR P2Y (also requires parallel HDF5)
 #
 # Check whether --enable-hdf5_p2y_support was given.
-if test ${enable_hdf5_p2y_support+y}
-then :
+if test "${enable_hdf5_p2y_support+set}" = set; then :
   enableval=$enable_hdf5_p2y_support;
 fi
 
@@ -13757,13 +12976,12 @@ 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_ac_Lib=`printf "%s\n" "ac_cv_lib_z ""_deflate" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz " >&5
-printf %s "checking for deflate in -lz ... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+as_ac_Lib=`$as_echo "ac_cv_lib_z ''_deflate" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz " >&5
+$as_echo_n "checking for deflate in -lz ... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz   $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13772,6 +12990,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char deflate ();
 #ifdef F77_DUMMY_MAIN
 
@@ -13790,39 +13011,36 @@ char deflate ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return deflate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else $as_nop
+else
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   use_libz="yes";
-else $as_nop
+else
   use_libz="no";
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lsz" >&5
-printf %s "checking for deflate in -lsz... " >&6; }
-if test ${ac_cv_lib_sz_deflate+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lsz" >&5
+$as_echo_n "checking for deflate in -lsz... " >&6; }
+if ${ac_cv_lib_sz_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13831,6 +13049,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char deflate ();
 #ifdef F77_DUMMY_MAIN
 
@@ -13849,38 +13070,35 @@ char deflate ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return deflate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sz_deflate=yes
-else $as_nop
+else
   ac_cv_lib_sz_deflate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sz_deflate" >&5
-printf "%s\n" "$ac_cv_lib_sz_deflate" >&6; }
-if test "x$ac_cv_lib_sz_deflate" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sz_deflate" >&5
+$as_echo "$ac_cv_lib_sz_deflate" >&6; }
+if test "x$ac_cv_lib_sz_deflate" = xyes; then :
   use_libsz="yes";
-else $as_nop
+else
   use_libsz="no";
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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 :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13889,6 +13107,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dlopen ();
 #ifdef F77_DUMMY_MAIN
 
@@ -13907,38 +13128,35 @@ char dlopen ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else $as_nop
+else
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $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 :
   use_libdl="yes";
-else $as_nop
+else
   use_libdl="no";
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curl_version in -lcurl" >&5
-printf %s "checking for curl_version in -lcurl... " >&6; }
-if test ${ac_cv_lib_curl_curl_version+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_version in -lcurl" >&5
+$as_echo_n "checking for curl_version in -lcurl... " >&6; }
+if ${ac_cv_lib_curl_curl_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13947,6 +13165,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char curl_version ();
 #ifdef F77_DUMMY_MAIN
 
@@ -13965,38 +13186,35 @@ char curl_version ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return curl_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_version=yes
-else $as_nop
+else
   ac_cv_lib_curl_curl_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_version" >&5
-printf "%s\n" "$ac_cv_lib_curl_curl_version" >&6; }
-if test "x$ac_cv_lib_curl_curl_version" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_version" >&5
+$as_echo "$ac_cv_lib_curl_curl_version" >&6; }
+if test "x$ac_cv_lib_curl_curl_version" = xyes; then :
   use_libcurl="yes";
-else $as_nop
+else
   use_libcurl="no";
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-printf %s "checking for cos in -lm... " >&6; }
-if test ${ac_cv_lib_m_cos+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if ${ac_cv_lib_m_cos+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14005,6 +13223,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char cos ();
 #ifdef F77_DUMMY_MAIN
 
@@ -14023,29 +13244,27 @@ char cos ();
 #endif
 #endif
 int
-main (void)
+main ()
 {
 return cos ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_cos=yes
-else $as_nop
+else
   ac_cv_lib_m_cos=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-printf "%s\n" "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = xyes; then :
   use_libm="yes";
-else $as_nop
+else
   use_libm="no";
 fi
 
@@ -14074,14 +13293,14 @@ if test x"$enable_hdf5" = "xyes"; then
  #
  if ! test "$with_hdf5_libs" = "internal" ; then
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HDF5" >&5
-printf %s "checking for HDF5... " >&6; } ;
-  if   test -d "$with_hdf5_libdir"    ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: in libdir $with_hdf5_libdir" >&5
-printf "%s\n" "in libdir $with_hdf5_libdir" >&6; } ;
-  elif test -d "$with_hdf5_path"    ;   then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: in path $with_hdf5_path" >&5
-printf "%s\n" "in path $with_hdf5_path" >&6; } ;
-  elif test x"$with_hdf5_libs" != "x" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using $with_hdf5_libs" >&5
-printf "%s\n" "using $with_hdf5_libs" >&6; } ;
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HDF5" >&5
+$as_echo_n "checking for HDF5... " >&6; } ;
+  if   test -d "$with_hdf5_libdir"    ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: in libdir $with_hdf5_libdir" >&5
+$as_echo "in libdir $with_hdf5_libdir" >&6; } ;
+  elif test -d "$with_hdf5_path"    ;   then { $as_echo "$as_me:${as_lineno-$LINENO}: result: in path $with_hdf5_path" >&5
+$as_echo "in path $with_hdf5_path" >&6; } ;
+  elif test x"$with_hdf5_libs" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $with_hdf5_libs" >&5
+$as_echo "using $with_hdf5_libs" >&6; } ;
   fi
   #
   ac_ext=${ac_fc_srcext-f}
@@ -14122,26 +13341,25 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   hdf5=yes
-else $as_nop
+else
   hdf5=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext;
   #
   FCFLAGS="$save_fcflags" ;
   LIBS="$save_libs" ;
   #
   if test "x$hdf5" = "xno" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;
     #
     # Automatic detection of hdf5 libs copied from QE
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HDF5 using h5pfc/h5fc system compilers" >&5
-printf %s "checking for HDF5 using h5pfc/h5fc system compilers... " >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HDF5 using h5pfc/h5fc system compilers" >&5
+$as_echo_n "checking for HDF5 using h5pfc/h5fc system compilers... " >&6; } ;
     #
     h5pfc="none"
     if test -e $with_hdf5_path/bin/h5pfc; then
@@ -14189,13 +13407,12 @@ printf %s "checking for HDF5 using h5pfc/h5fc system compilers... " >&6; } ;
 
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   hdf5=yes
-else $as_nop
+else
   hdf5=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext;
     #
     FCFLAGS="$save_fcflags" ;
@@ -14204,10 +13421,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
    fi
    #
    if test "x$hdf5" = xno; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HDF5 using automatic library list" >&5
-printf %s "checking for HDF5 using automatic library list... " >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HDF5 using automatic library list" >&5
+$as_echo_n "checking for HDF5 using automatic library list... " >&6; } ;
       #
       # re-define lib and inc dirs
       #
@@ -14247,13 +13464,12 @@ printf %s "checking for HDF5 using automatic library list... " >&6; } ;
 
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   hdf5=yes
-else $as_nop
+else
   hdf5=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext;
       #
       FCFLAGS="$save_fcflags" ;
@@ -14267,13 +13483,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     HDF5_LIBS="$try_HDF5_LIBS" ;
     HDF5_INCS="$try_HDF5_INCS" ;
     if test $IO_LIB_VER = "parallel"; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes - parallel lib found" >&5
-printf "%s\n" "yes - parallel lib found" >&6; } ;
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - parallel lib found" >&5
+$as_echo "yes - parallel lib found" >&6; } ;
        HDF5_OPT="--enable-parallel"  ;
     fi
     if test $IO_LIB_VER = "serial";   then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes - serial lib found" >&5
-printf "%s\n" "yes - serial lib found" >&6; } ;
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - serial lib found" >&5
+$as_echo "yes - serial lib found" >&6; } ;
        HDF5_OPT="--disable-parallel"  ;
     fi
     # AC_MSG_RESULT([yes]) ;
@@ -14282,12 +13498,12 @@ printf "%s\n" "yes - serial lib found" >&6; } ;
   #
   if test "x$hdf5" = xno; then
     if ! test "$with_hdf5_libs" = "internal" ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;
     fi
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal HDF5 library" >&5
-printf %s "checking for internal HDF5 library... " >&6; };
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal HDF5 library" >&5
+$as_echo_n "checking for internal HDF5 library... " >&6; };
     internal_hdf5="yes" ;
     #
     NETCDF_VER="v4";
@@ -14307,8 +13523,8 @@ printf %s "checking for internal HDF5 library... " >&6; };
     if test -e "${NETCDF_HDF5_PATH}/lib/libhdf5.a"; then
       #
       compile_hdf5="no" ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; } ;
       #
     elif test "$IO_LIB_VER" = "serial" && test -e "${NETCDF_HDF5_PAR_PATH}/lib/libhdf5.a"; then
       #
@@ -14317,8 +13533,8 @@ printf "%s\n" "already compiled" >&6; } ;
       #HDF5_LIBS="${NETCDF_HDF5_PAR_PATH}/lib/libhdf5_hl_fortran.a ${NETCDF_HDF5_PAR_PATH}/lib/libhdf5_fortran.a ${NETCDF_HDF5_PAR_PATH}/lib/libhdf5_hl.a ${NETCDF_HDF5_PAR_PATH}/lib/libhdf5.a" ;
       HDF5_LIBS="-L${NETCDF_HDF5_PAR_PATH}/lib/ -lhdf5_hl_fortran -lhdf5_fortran -lhdf5_hl -lhdf5" ;
       HDF5_INCS="${IFLAG}${NETCDF_HDF5_PAR_PATH}/include" ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled (using parallel version)" >&5
-printf "%s\n" "already compiled (using parallel version)" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled (using parallel version)" >&5
+$as_echo "already compiled (using parallel version)" >&6; } ;
       #
     else
       #
@@ -14327,8 +13543,8 @@ printf "%s\n" "already compiled (using parallel version)" >&6; } ;
       if test "$IO_LIB_VER" = "serial";   then HDF5_OPT="--disable-parallel" ; fi
       if test "$IO_LIB_VER" = "parallel"; then HDF5_OPT="--enable-parallel"  ; fi
       #
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; } ;
       #
     fi
     #
@@ -14385,58 +13601,50 @@ fi
 
 
 # Check whether --with-netcdf_libs was given.
-if test ${with_netcdf_libs+y}
-then :
+if test "${with_netcdf_libs+set}" = set; then :
   withval=$with_netcdf_libs;
 fi
 
 
 # Check whether --with-netcdf_path was given.
-if test ${with_netcdf_path+y}
-then :
+if test "${with_netcdf_path+set}" = set; then :
   withval=$with_netcdf_path;
 fi
 
 
 # Check whether --with-netcdf_libdir was given.
-if test ${with_netcdf_libdir+y}
-then :
+if test "${with_netcdf_libdir+set}" = set; then :
   withval=$with_netcdf_libdir;
 fi
 
 
 # Check whether --with-netcdf_includedir was given.
-if test ${with_netcdf_includedir+y}
-then :
+if test "${with_netcdf_includedir+set}" = set; then :
   withval=$with_netcdf_includedir;
 fi
 
 #
 
 # Check whether --with-netcdff_libs was given.
-if test ${with_netcdff_libs+y}
-then :
+if test "${with_netcdff_libs+set}" = set; then :
   withval=$with_netcdff_libs;
 fi
 
 
 # Check whether --with-netcdff_path was given.
-if test ${with_netcdff_path+y}
-then :
+if test "${with_netcdff_path+set}" = set; then :
   withval=$with_netcdff_path;
 fi
 
 
 # Check whether --with-netcdff_libdir was given.
-if test ${with_netcdff_libdir+y}
-then :
+if test "${with_netcdff_libdir+set}" = set; then :
   withval=$with_netcdff_libdir;
 fi
 
 
 # Check whether --with-netcdff_includedir was given.
-if test ${with_netcdff_includedir+y}
-then :
+if test "${with_netcdff_includedir+set}" = set; then :
   withval=$with_netcdff_includedir;
 fi
 
@@ -14444,8 +13652,7 @@ fi
 # Large Databases Support (LFS)
 #
 # Check whether --enable-netcdf_classic was given.
-if test ${enable_netcdf_classic+y}
-then :
+if test "${enable_netcdf_classic+set}" = set; then :
   enableval=$enable_netcdf_classic;
 fi
 
@@ -14453,8 +13660,7 @@ fi
 # NETCDF PAR IO
 #
 # Check whether --enable-netcdf_par_io was given.
-if test ${enable_netcdf_par_io+y}
-then :
+if test "${enable_netcdf_par_io+set}" = set; then :
   enableval=$enable_netcdf_par_io;
 fi
 
@@ -14462,8 +13668,7 @@ fi
 # HDF5 support
 #
 # Check whether --enable-netcdf_v3 was given.
-if test ${enable_netcdf_v3+y}
-then :
+if test "${enable_netcdf_v3+set}" = set; then :
   enableval=$enable_netcdf_v3;
 fi
 
@@ -14471,8 +13676,7 @@ fi
 # HDF5 data compression
 #
 # Check whether --enable-hdf5_compression was given.
-if test ${enable_hdf5_compression+y}
-then :
+if test "${enable_hdf5_compression+set}" = set; then :
   enableval=$enable_hdf5_compression;
 fi
 
@@ -14480,8 +13684,7 @@ fi
 # NETCDF SHODOW FOR OUTPUT FILES
 #
 # Check whether --enable-netcdf_output was given.
-if test ${enable_netcdf_output+y}
-then :
+if test "${enable_netcdf_output+set}" = set; then :
   enableval=$enable_netcdf_output;
 fi
 
@@ -14517,10 +13720,10 @@ if test -d "$with_netcdf_path" || test -d "$with_netcdf_libdir" ; then
   #
   # external netcdf
   #
-  if test -d "$with_netcdf_libdir" ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NetCDF in $with_netcdf_libdir" >&5
-printf %s "checking for NetCDF in $with_netcdf_libdir... " >&6; } ;
-  elif test -d "$with_netcdf_path" ; then  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NetCDF in $with_netcdf_path" >&5
-printf %s "checking for NetCDF in $with_netcdf_path... " >&6; } ;
+  if test -d "$with_netcdf_libdir" ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetCDF in $with_netcdf_libdir" >&5
+$as_echo_n "checking for NetCDF in $with_netcdf_libdir... " >&6; } ;
+  elif test -d "$with_netcdf_path" ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetCDF in $with_netcdf_path" >&5
+$as_echo_n "checking for NetCDF in $with_netcdf_path... " >&6; } ;
   fi
   #
   if test -d "$with_netcdf_path" ; then
@@ -14565,15 +13768,15 @@ elif test x"$with_netcdf_libs" != "x" ; then
   #
   # directly provided lib
   #
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NetCDF Library using $with_netcdf_libs" >&5
-printf %s "checking for NetCDF Library using $with_netcdf_libs... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetCDF Library using $with_netcdf_libs" >&5
+$as_echo_n "checking for NetCDF Library using $with_netcdf_libs... " >&6; }
   if test -d "$with_netcdf_includedir" ; then  try_NETCDF_INCS="$IFLAG$with_netcdf_includedir" ; fi
   if test -d "$with_netcdff_includedir" ; then try_NETCDFF_INCS="$IFLAG$with_netcdff_includedir" ; fi
   netcdf="yes";
   try_NETCDF_LIBS="$with_netcdf_libs" ;
   try_NETCDFF_LIBS="$with_netcdff_libs" ;
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   #
 fi
 #
@@ -14598,24 +13801,23 @@ if test x"$enable_hdf5" = "xno"; then
       nf_err = nf90_create('netcdf_test',nf90_share,ID)
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   netcdf=yes
-else $as_nop
+else
   netcdf=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
     #
     if test "x$netcdf" = "xyes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;
       NETCDF_INCS="$try_NETCDF_INCS" ;
       NETCDF_LIBS="$try_NETCDF_LIBS" ;
       NETCDFF_INCS="$try_NETCDFF_INCS" ;
       NETCDFF_LIBS="$try_NETCDFF_LIBS" ;
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;
     fi
     #
     FCFLAGS="$save_fcflags" ;
@@ -14626,8 +13828,8 @@ printf "%s\n" "no" >&6; } ;
     #
     # internal netcdf
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal NetCDF library" >&5
-printf %s "checking for internal NetCDF library... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal NetCDF library" >&5
+$as_echo_n "checking for internal NetCDF library... " >&6; }
     #
     internal_netcdf="yes"
     #
@@ -14653,22 +13855,22 @@ printf %s "checking for internal NetCDF library... " >&6; }
     if test x"$enable_pnecdf" = "xyes"; then
       if test -e "${NETCDF_HDF5_PATH}/lib/libnetcdf.a" && test -e "${NETCDF_HDF5_PATH}/lib/libnetcdff.a"; then
         compile_netcdf="no" ;
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; } ;
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; } ;
       else
         compile_netcdf="yes" ;
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; } ;
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; } ;
       fi
     else
       if test -e "${NETCDF_HDF5_PATH}/lib/libnetcdf.a" && test -e "${NETCDF_HDF5_PATH}/lib/libnetcdff.a"; then
         compile_netcdf="no" ;
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; } ;
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; } ;
       else
         compile_netcdf="yes" ;
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; } ;
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; } ;
       fi
     fi
     #
@@ -14703,13 +13905,12 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
       end
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   netcdf=yes
-else $as_nop
+else
   netcdf=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext;
   #
   if test "x$netcdf" = "xyes"; then
@@ -14717,8 +13918,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     NETCDF_INCS="$try_NETCDF_INCS" ;
     NETCDFF_LIBS="$try_NETCDFF_LIBS" ;
     NETCDFF_INCS="$try_NETCDFF_INCS" ;
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;
     #
   fi
   #
@@ -14726,11 +13927,11 @@ printf "%s\n" "yes" >&6; } ;
   LIBS="$save_libs" ;
   #
   if test "x$netcdf" = "xno"; then
-    if test -d "$with_netcdf_libdir" || test -d "$with_netcdf_path" || test -d "$with_netcdff_libdir" || test -d "$with_netcdff_path" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ; fi
+    if test -d "$with_netcdf_libdir" || test -d "$with_netcdf_path" || test -d "$with_netcdff_libdir" || test -d "$with_netcdff_path" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ; fi
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal NETCDF library" >&5
-printf %s "checking for internal NETCDF library... " >&6; };
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal NETCDF library" >&5
+$as_echo_n "checking for internal NETCDF library... " >&6; };
     internal_netcdf="yes" ;
     #
     NETCDF_OPT="--enable-netcdf-4";
@@ -14751,8 +13952,8 @@ printf %s "checking for internal NETCDF library... " >&6; };
     if test -e "${NETCDF_HDF5_PATH}/lib/libnetcdf.a" && test -e "${NETCDF_HDF5_PATH}/lib/libnetcdff.a" ; then
       #
       compile_netcdf="no" ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; } ;
       #
     elif test "$IO_LIB_VER" = "serial" && test -e "${NETCDF_HDF5_PAR_PATH}/lib/libnetcdf.a" && test -e "${NETCDF_HDF5_PAR_PATH}/lib/libnetcdff.a" && test -e "${NETCDF_HDF5_PAR_PATH}/lib/libhdf5.a"; then
       #
@@ -14764,8 +13965,8 @@ printf "%s\n" "already compiled" >&6; } ;
       #NETCDFF_LIBS="${NETCDF_HDF5_PAR_PATH}/lib/libnetcdff.a" ;
       NETCDFF_LIBS="-L${NETCDF_HDF5_PAR_PATH}/lib/ -lnetcdff" ;
       NETCDFF_INCS="${IFLAG}${NETCDF_HDF5_PAR_PATH}/include" ;
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled (using parallel version)" >&5
-printf "%s\n" "already compiled (using parallel version)" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled (using parallel version)" >&5
+$as_echo "already compiled (using parallel version)" >&6; } ;
       #
     else
       #
@@ -14774,8 +13975,8 @@ printf "%s\n" "already compiled (using parallel version)" >&6; } ;
       if test "$IO_LIB_VER" = "serial";   then HDF5_OPT="--disable-parallel" ; fi
       if test "$IO_LIB_VER" = "parallel"; then HDF5_OPT="--enable-parallel"  ; fi
       #
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; } ;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; } ;
       #
     fi
     #
@@ -14857,37 +14058,32 @@ fi
 
 
 # Check whether --enable-yaml_output was given.
-if test ${enable_yaml_output+y}
-then :
+if test "${enable_yaml_output+set}" = set; then :
   enableval=$enable_yaml_output;
 fi
 
 
 
 # Check whether --with-yaml_libs was given.
-if test ${with_yaml_libs+y}
-then :
+if test "${with_yaml_libs+set}" = set; then :
   withval=$with_yaml_libs;
 fi
 
 
 # Check whether --with-yaml_libdir was given.
-if test ${with_yaml_libdir+y}
-then :
+if test "${with_yaml_libdir+set}" = set; then :
   withval=$with_yaml_libdir;
 fi
 
 
 # Check whether --with-yaml_libdir was given.
-if test ${with_yaml_libdir+y}
-then :
+if test "${with_yaml_libdir+set}" = set; then :
   withval=$with_yaml_libdir;
 fi
 
 
 # Check whether --with-yaml_includedir was given.
-if test ${with_yaml_includedir+y}
-then :
+if test "${with_yaml_includedir+set}" = set; then :
   withval=$with_yaml_includedir;
 fi
 
@@ -14895,29 +14091,25 @@ fi
 
 
 # Check whether --with-futile_libs was given.
-if test ${with_futile_libs+y}
-then :
+if test "${with_futile_libs+set}" = set; then :
   withval=$with_futile_libs;
 fi
 
 
 # Check whether --with-futile_libdir was given.
-if test ${with_futile_libdir+y}
-then :
+if test "${with_futile_libdir+set}" = set; then :
   withval=$with_futile_libdir;
 fi
 
 
 # Check whether --with-futile_libdir was given.
-if test ${with_futile_libdir+y}
-then :
+if test "${with_futile_libdir+set}" = set; then :
   withval=$with_futile_libdir;
 fi
 
 
 # Check whether --with-futile_includedir was given.
-if test ${with_futile_includedir+y}
-then :
+if test "${with_futile_includedir+set}" = set; then :
   withval=$with_futile_includedir;
 fi
 
@@ -14940,10 +14132,10 @@ if test "x$enable_yaml" = "xyes" ; then
     #
     # external YAML
     #
-    if test -d "$with_yaml_path" ;   then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for YAML in $with_yaml_path" >&5
-printf %s "checking for YAML in $with_yaml_path... " >&6; } ; fi
-    if test -d "$with_yaml_libdir" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for YAML in $with_yaml_libdir" >&5
-printf %s "checking for YAML in $with_yaml_libdir... " >&6; } ; fi
+    if test -d "$with_yaml_path" ;   then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for YAML in $with_yaml_path" >&5
+$as_echo_n "checking for YAML in $with_yaml_path... " >&6; } ; fi
+    if test -d "$with_yaml_libdir" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for YAML in $with_yaml_libdir" >&5
+$as_echo_n "checking for YAML in $with_yaml_libdir... " >&6; } ; fi
     #
     if test -d "$with_yaml_path" ; then
         try_yaml_libdir_src=$with_yaml_path/src
@@ -14962,55 +14154,55 @@ printf %s "checking for YAML in $with_yaml_libdir... " >&6; } ; fi
       compile_yaml="no"
       YAML_INCS="$IFLAG$try_yaml_incdir_src"
       YAML_LIBS="$try_yaml_libdir_src/libyaml.a"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     elif test -r $try_yaml_libdir/libyaml.a  && test -e $try_yaml_incdir/yaml_module.mod ; then
       compile_yaml="no"
       YAML_INCS="$IFLAG$try_yaml_incdir"
       YAML_LIBS="$try_yaml_libdir/libyaml.a"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no. Fallback to internal library." >&5
-printf "%s\n" "no. Fallback to internal library." >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Fallback to internal library." >&5
+$as_echo "no. Fallback to internal library." >&6; }
     fi
   elif test x"$with_yaml_libs" != "x" ; then
     #
     # directly provided lib
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for YAML Library using $with_yaml_libs" >&5
-printf %s "checking for YAML Library using $with_yaml_libs... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for YAML Library using $with_yaml_libs" >&5
+$as_echo_n "checking for YAML Library using $with_yaml_libs... " >&6; }
     compile_yaml="no"
     if test -d "$with_yaml_includedir" ; then YAML_INCS="$IFLAG$with_yaml_includedir" ; fi
     YAML_LIBS="$with_yaml_libs"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
   if test "$YAML_LIBS" = " "; then
     #
     # internal YAML
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal YAML library" >&5
-printf %s "checking for internal YAML library... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal YAML library" >&5
+$as_echo_n "checking for internal YAML library... " >&6; }
     internal_yaml="yes"
     YAML_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include/"
     YAML_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libyaml.a"
     if ! test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libyaml.a" || ! test -e "${extlibs_path}/${FCKIND}/${FC}/include/yaml_parse.mod" || ! test -e "${extlibs_path}/${FCKIND}/${FC}/include/yaml.h"; then
       compile_yaml="yes"
       if test ! -d lib ; then mkdir lib ; fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; }
     else
       compile_yaml="no"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; }
     fi
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for YAML library" >&5
-printf %s "checking for YAML library... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for YAML library" >&5
+$as_echo_n "checking for YAML library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -15034,10 +14226,10 @@ if test "x$enable_futile" = "xyes" ; then
     #
     # external FUTILE
     #
-    if test -d "$with_futile_path" ;   then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUTILE in $with_futile_path" >&5
-printf %s "checking for FUTILE in $with_futile_path... " >&6; } ; fi
-    if test -d "$with_futile_libdir" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUTILE in $with_futile_libdir" >&5
-printf %s "checking for FUTILE in $with_futile_libdir... " >&6; } ; fi
+    if test -d "$with_futile_path" ;   then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUTILE in $with_futile_path" >&5
+$as_echo_n "checking for FUTILE in $with_futile_path... " >&6; } ; fi
+    if test -d "$with_futile_libdir" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUTILE in $with_futile_libdir" >&5
+$as_echo_n "checking for FUTILE in $with_futile_libdir... " >&6; } ; fi
     #
     if test -d "$with_futile_path" ; then
         try_futile_libdir_src=$with_futile_path/src
@@ -15056,55 +14248,55 @@ printf %s "checking for FUTILE in $with_futile_libdir... " >&6; } ; fi
       compile_futile="no"
       FUTILE_INCS="$IFLAG$try_futile_incdir_src"
       FUTILE_LIBS="$try_futile_libdir_src/libfutile-1.a"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     elif test -r $try_futile_libdir/libfutile-1.a  && test -e $try_futile_incdir/futile_module.mod ; then
       compile_futile="no"
       FUTILE_INCS="$IFLAG$try_futile_incdir"
       FUTILE_LIBS="$try_futile_libdir/libfutile-1.a"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no. Fallback to internal library." >&5
-printf "%s\n" "no. Fallback to internal library." >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Fallback to internal library." >&5
+$as_echo "no. Fallback to internal library." >&6; }
     fi
   elif test x"$with_futile_libs" != "x" ; then
     #
     # directly provided lib
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUTILE Library using $with_futile_libs" >&5
-printf %s "checking for FUTILE Library using $with_futile_libs... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUTILE Library using $with_futile_libs" >&5
+$as_echo_n "checking for FUTILE Library using $with_futile_libs... " >&6; }
     compile_futile="no"
     if test -d "$with_futile_includedir" ; then FUTILE_INCS="$IFLAG$with_futile_includedir" ; fi
     FUTILE_LIBS="$with_futile_libs"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
   if test "$FUTILE_LIBS" = " "; then
     #
     # internal FUTILE
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal FUTILE library" >&5
-printf %s "checking for internal FUTILE library... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal FUTILE library" >&5
+$as_echo_n "checking for internal FUTILE library... " >&6; }
     internal_futile="yes"
     FUTILE_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include/"
     FUTILE_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libfutile-1.a"
     if ! test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libfutile-1.a" || ! test -e "${extlibs_path}/${FCKIND}/${FC}/include/futile.mod" || ! test -e "${extlibs_path}/${FCKIND}/${FC}/include/futile.h"; then
       compile_futile="yes"
       if test ! -d lib ; then mkdir lib ; fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; }
     else
       compile_futile="no"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; }
     fi
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUTILE library" >&5
-printf %s "checking for FUTILE library... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUTILE library" >&5
+$as_echo_n "checking for FUTILE library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 #
 if test $enable_yaml = "yes" && test $enable_futile = "yes" ; then
@@ -15130,38 +14322,33 @@ fi
 
 #
 # Check whether --enable-iotk was given.
-if test ${enable_iotk+y}
-then :
+if test "${enable_iotk+set}" = set; then :
   enableval=$enable_iotk;
-else $as_nop
+else
   enable_iotk="yes"
 fi
 
 
 # Check whether --with-iotk_libs was given.
-if test ${with_iotk_libs+y}
-then :
+if test "${with_iotk_libs+set}" = set; then :
   withval=$with_iotk_libs;
 fi
 
 
 # Check whether --with-iotk_path was given.
-if test ${with_iotk_path+y}
-then :
+if test "${with_iotk_path+set}" = set; then :
   withval=$with_iotk_path;
 fi
 
 
 # Check whether --with-iotk_libdir was given.
-if test ${with_iotk_libdir+y}
-then :
+if test "${with_iotk_libdir+set}" = set; then :
   withval=$with_iotk_libdir;
 fi
 
 
 # Check whether --with-iotk_includedir was given.
-if test ${with_iotk_includedir+y}
-then :
+if test "${with_iotk_includedir+set}" = set; then :
   withval=$with_iotk_includedir;
 fi
 
@@ -15182,10 +14369,10 @@ if test "x$enable_iotk" = "xyes" ; then
     #
     # external IOTK
     #
-    if test -d "$with_iotk_path" ;   then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IOTK in $with_iotk_path" >&5
-printf %s "checking for IOTK in $with_iotk_path... " >&6; } ; fi
-    if test -d "$with_iotk_libdir" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IOTK in $with_iotk_libdir" >&5
-printf %s "checking for IOTK in $with_iotk_libdir... " >&6; } ; fi
+    if test -d "$with_iotk_path" ;   then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IOTK in $with_iotk_path" >&5
+$as_echo_n "checking for IOTK in $with_iotk_path... " >&6; } ; fi
+    if test -d "$with_iotk_libdir" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IOTK in $with_iotk_libdir" >&5
+$as_echo_n "checking for IOTK in $with_iotk_libdir... " >&6; } ; fi
     #
     if test -d "$with_iotk_path" ; then
         try_iotk_libdir_src=$with_iotk_path/src
@@ -15206,39 +14393,39 @@ printf %s "checking for IOTK in $with_iotk_libdir... " >&6; } ; fi
       IOTK_INCS="$IFLAG$try_iotk_incdir_src"
       #IOTK_LIBS="$try_iotk_libdir_src/libiotk.a"
       IOTK_LIBS="-L$try_iotk_libdir_src/ -liotk"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     elif test -r $try_iotk_libdir/libiotk.a  && test -e $try_iotk_incdir/iotk_module.mod ; then
       compile_p2y="yes"
       compile_iotk="no"
       IOTK_INCS="$IFLAG$try_iotk_incdir"
       #IOTK_LIBS="$try_iotk_libdir/libiotk.a"
       IOTK_LIBS="-L$try_iotk_libdir/ -liotk"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no. Fallback to internal library." >&5
-printf "%s\n" "no. Fallback to internal library." >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Fallback to internal library." >&5
+$as_echo "no. Fallback to internal library." >&6; }
     fi
   elif test x"$with_iotk_libs" != "x" ; then
     #
     # directly provided lib
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IOTK Library using $with_iotk_libs" >&5
-printf %s "checking for IOTK Library using $with_iotk_libs... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IOTK Library using $with_iotk_libs" >&5
+$as_echo_n "checking for IOTK Library using $with_iotk_libs... " >&6; }
     compile_p2y="yes"
     compile_iotk="no"
     if test -d "$with_iotk_includedir" ; then IOTK_INCS="$IFLAG$with_iotk_includedir" ; fi
     IOTK_LIBS="$with_iotk_libs"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
   if test "$IOTK_LIBS" = " "; then
     #
     # internal IOTK
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal IOTK library" >&5
-printf %s "checking for internal IOTK library... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal IOTK library" >&5
+$as_echo_n "checking for internal IOTK library... " >&6; }
     internal_iotk="yes"
     compile_p2y="yes"
     IOTK_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include/"
@@ -15247,14 +14434,14 @@ printf %s "checking for internal IOTK library... " >&6; }
     if ! test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libiotk.a" || ! test -e "${extlibs_path}/${FCKIND}/${FC}/include/iotk_base.mod" || ! test -e "${extlibs_path}/${FCKIND}/${FC}/include/iotk_specials.h"; then
       compile_iotk="yes"
       if test ! -d lib ; then mkdir lib ; fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; }
       ac_config_files="$ac_config_files lib/iotk/make_iotk.inc:lib/iotk/make_iotk.inc.in"
 
     else
       compile_iotk="no"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
-printf "%s\n" "already compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; }
     fi
   fi
   #
@@ -15270,10 +14457,10 @@ printf "%s\n" "already compiled" >&6; }
 else
   PW_VER="no support"
   PW_CPP=""
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IOTK library" >&5
-printf %s "checking for IOTK library... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IOTK library" >&5
+$as_echo_n "checking for IOTK library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 #
 #
@@ -15293,38 +14480,33 @@ fi
 
 
 # Check whether --enable-etsf_io was given.
-if test ${enable_etsf_io+y}
-then :
+if test "${enable_etsf_io+set}" = set; then :
   enableval=$enable_etsf_io;
-else $as_nop
+else
   enable_etsf_io="no"
 fi
 
 
 # Check whether --with-etsf_io_libs was given.
-if test ${with_etsf_io_libs+y}
-then :
+if test "${with_etsf_io_libs+set}" = set; then :
   withval=$with_etsf_io_libs;
 fi
 
 
 # Check whether --with-etsf_io_path was given.
-if test ${with_etsf_io_path+y}
-then :
+if test "${with_etsf_io_path+set}" = set; then :
   withval=$with_etsf_io_path;
 fi
 
 
 # Check whether --with-etsf_io_libdir was given.
-if test ${with_etsf_io_libdir+y}
-then :
+if test "${with_etsf_io_libdir+set}" = set; then :
   withval=$with_etsf_io_libdir;
 fi
 
 
 # Check whether --with-etsf_io_includedir was given.
-if test ${with_etsf_io_includedir+y}
-then :
+if test "${with_etsf_io_includedir+set}" = set; then :
   withval=$with_etsf_io_includedir;
 fi
 
@@ -15351,10 +14533,10 @@ if test "x$enable_etsf_io" = "xyes" ; then
     #
     # external ETSF_IO
     #
-    if test -d "$with_etsf_io_path" ;   then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO in $with_etsf_io_path" >&5
-printf %s "checking for ETSF_IO in $with_etsf_io_path... " >&6; } ; fi
-    if test -d "$with_etsf_io_libdir" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO in $with_etsf_io_libdir" >&5
-printf %s "checking for ETSF_IO in $with_etsf_io_libdir... " >&6; } ; fi
+    if test -d "$with_etsf_io_path" ;   then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO in $with_etsf_io_path" >&5
+$as_echo_n "checking for ETSF_IO in $with_etsf_io_path... " >&6; } ; fi
+    if test -d "$with_etsf_io_libdir" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO in $with_etsf_io_libdir" >&5
+$as_echo_n "checking for ETSF_IO in $with_etsf_io_libdir... " >&6; } ; fi
     #
     if test -d "$with_etsf_io_path" ; then
         try_etsf_libdir=$with_etsf_io_path/lib
@@ -15373,50 +14555,50 @@ printf %s "checking for ETSF_IO in $with_etsf_io_libdir... " >&6; } ; fi
       ETSF_LIBS="$try_etsf_libdir/libetsf_io.a"
       ETSF_INCS="$IFLAG$try_etsf_incdir"
       #
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   elif test x"$with_etsf_io_libs" != "x" ; then
     #
     # directly provided lib
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO Library using $with_etsf_io_libs" >&5
-printf %s "checking for ETSF_IO Library using $with_etsf_io_libs... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO Library using $with_etsf_io_libs" >&5
+$as_echo_n "checking for ETSF_IO Library using $with_etsf_io_libs... " >&6; }
     internal_etsf="no"
     compile_e2y="yes"
     if test -d "$with_etsf_io_includedir" ; then ETSF_INCS="$IFLAG$with_etsf_io_includedir" ; fi
     ETSF_LIBS="$with_etsf_io_libs"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
     #
     # internal ETSF_IO
     #
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for internal ETSF_IO Library" >&5
-printf %s "checking for internal ETSF_IO Library... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal ETSF_IO Library" >&5
+$as_echo_n "checking for internal ETSF_IO Library... " >&6; }
     internal_etsf="yes"
     compile_e2y="yes"
     ETSF_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include"
     ETSF_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libetsf_io.a"
     if test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libetsf_io.a"; then
       compile_etsf="no"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found already compiled" >&5
-printf "%s\n" "found already compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found already compiled" >&5
+$as_echo "found already compiled" >&6; }
     else
       compile_etsf="yes"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
-printf "%s\n" "to be compiled" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: to be compiled" >&5
+$as_echo "to be compiled" >&6; }
     fi
   fi
   #
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO Library" >&5
-printf %s "checking for ETSF_IO Library... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETSF_IO Library" >&5
+$as_echo_n "checking for ETSF_IO Library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 #
 
@@ -15432,29 +14614,25 @@ fi
 
 
 # Check whether --with-libxc_libs was given.
-if test ${with_libxc_libs+y}
-then :
+if test "${with_libxc_libs+set}" = set; then :
   withval=$with_libxc_libs;
 fi
 
 
 # Check whether --with-libxc_path was given.
-if test ${with_libxc_path+y}
-then :
+if test "${with_libxc_path+set}" = set; then :
   withval=$with_libxc_path;
 fi
 
 
 # Check whether --with-libxc_libdir was given.
-if test ${with_libxc_libdir+y}
-then :
+if test "${with_libxc_libdir+set}" = set; then :
   withval=$with_libxc_libdir;
 fi
 
 
 # Check whether --with-libxc_includedir was given.
-if test ${with_libxc_includedir+y}
-then :
+if test "${with_libxc_includedir+set}" = set; then :
   withval=$with_libxc_includedir;
 fi
 
@@ -15467,8 +14645,8 @@ compile_libxc="no"
 acx_libxc_save_LIBS="$LIBS"
 acx_libxc_save_FCFLAGS="$FCFLAGS"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxc" >&5
-printf %s "checking for libxc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxc" >&5
+$as_echo_n "checking for libxc... " >&6; }
 
 testprog="      program main
 
@@ -15488,11 +14666,10 @@ if test ! -z "$LIBXC_LIBS"; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15522,11 +14699,10 @@ if test x"$acx_libxc_ok" = xno ; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   # if dynamic / user provided linkage did not work, try static one
@@ -15536,11 +14712,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   fi
 fi
@@ -15618,71 +14793,66 @@ if test x"$acx_libxc_ok" = xyes; then
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_11
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=110, acx_libxc_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_12
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=120, acx_libxc_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_20
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=200, acx_libxc_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_203
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=203, acx_libxc_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_21
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=210, acx_libxc_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_4x
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=400, acx_libxc_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 cat > conftest.$ac_ext <<_ACEOF
 $testprog_5x
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libxc_version=5,   acx_libxc_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-printf "%s\n" "#define LIBXC_VERSION $acx_libxc_version" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define LIBXC_VERSION $acx_libxc_version
+_ACEOF
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Found external LibXC version=$acx_libxc_version (should be 5)" >&5
-printf "%s\n" "Found external LibXC version=$acx_libxc_version (should be 5)" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Found external LibXC version=$acx_libxc_version (should be 5)" >&5
+$as_echo "Found external LibXC version=$acx_libxc_version (should be 5)" >&6; }
 fi
 
 if test x"$acx_libxc_ok" = xyes; then
@@ -15690,7 +14860,7 @@ if test x"$acx_libxc_ok" = xyes; then
   internal_libxc=no
   #
 
-printf "%s\n" "#define HAVE_LIBXC 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXC 1" >>confdefs.h
 
 fi
 
@@ -15703,12 +14873,12 @@ if test x"$acx_libxc_ok" = xno; then
   LIBXC_INCS="$IFLAG${extlibs_path}/${FCKIND}/${FC}/include"
   if test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libxc.a" && test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libxcf90.a" && test -e ${extlibs_path}/${FCKIND}/${FC}/lib/libxcf03.a; then
     compile_libxc="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Compatible external LibXC not found/specified. Found internal already compiled." >&5
-printf "%s\n" "Compatible external LibXC not found/specified. Found internal already compiled." >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compatible external LibXC not found/specified. Found internal already compiled." >&5
+$as_echo "Compatible external LibXC not found/specified. Found internal already compiled." >&6; }
   else
     compile_libxc="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Compatible external LibXC not found/specified. Internal to be compiled." >&5
-printf "%s\n" "Compatible external LibXC not found/specified. Internal to be compiled." >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compatible external LibXC not found/specified. Internal to be compiled." >&5
+$as_echo "Compatible external LibXC not found/specified. Internal to be compiled." >&6; }
   fi
 fi
 
@@ -15725,48 +14895,42 @@ LIBS="$acx_libxc_save_LIBS"
 
 
 # Check whether --with-cuda_libs was given.
-if test ${with_cuda_libs+y}
-then :
+if test "${with_cuda_libs+set}" = set; then :
   withval=$with_cuda_libs;
 fi
 
 
 # Check whether --with-cuda_incs was given.
-if test ${with_cuda_incs+y}
-then :
+if test "${with_cuda_incs+set}" = set; then :
   withval=$with_cuda_incs;
 fi
 
 #
 
 # Check whether --with-cuda_libdir was given.
-if test ${with_cuda_libdir+y}
-then :
+if test "${with_cuda_libdir+set}" = set; then :
   withval=$with_cuda_libdir;
 fi
 
 
 # Check whether --with-cuda_includedir was given.
-if test ${with_cuda_includedir+y}
-then :
+if test "${with_cuda_includedir+set}" = set; then :
   withval=$with_cuda_includedir;
 fi
 
 #
 
 # Check whether --with-cuda_path was given.
-if test ${with_cuda_path+y}
-then :
+if test "${with_cuda_path+set}" = set; then :
   withval=$with_cuda_path;
 fi
 
 
 #
 # Check whether --enable-cuda-libs-check was given.
-if test ${enable_cuda_libs_check+y}
-then :
+if test "${enable_cuda_libs_check+set}" = set; then :
   enableval=$enable_cuda_libs_check;
-else $as_nop
+else
   enable_cuda_libs_check=yes
 fi
 
@@ -15828,69 +14992,65 @@ FCFLAGS="$LIBCUDA_INCS $acx_libcuda_save_FCFLAGS"
 
 # set from environment variable, if not blank
 if test ! -z "$CUDA_LIBS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcuda from environment" >&5
-printf %s "checking for libcuda from environment... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcuda from environment" >&5
+$as_echo_n "checking for libcuda from environment... " >&6; }
   LIBCUDA_LIBS="$CUDA_LIBS"
   LIBS="$LIBCUDA_LIBS"
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libcuda_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
 # set from --with-cuda-libs flag
 if test x"$acx_libcuda_ok" = xno && test ! -z "$with_cuda_libs" ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcuda from --with-cuda-libs" >&5
-printf %s "checking for libcuda from --with-cuda-libs... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcuda from --with-cuda-libs" >&5
+$as_echo_n "checking for libcuda from --with-cuda-libs... " >&6; }
   LIBCUDA_LIBS="$with_cuda_libs"
   LIBS="$LIBCUDA_LIBS"
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libcuda_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
 # dynamic linkage, separate Fortran interface
 if test x"$acx_libcuda_ok" = xno; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcuda from specified libcuda path, dynamic" >&5
-printf %s "checking for libcuda from specified libcuda path, dynamic... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcuda from specified libcuda path, dynamic" >&5
+$as_echo_n "checking for libcuda from specified libcuda path, dynamic... " >&6; }
   LIBCUDA_LIBS="-L$libcuda_libdir -lcufft -lcusolver -lcublas -lcudart -lcuda"
   LIBS="$LIBCUDA_LIBS"
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libcuda_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
 # static linkage, separate Fortran interface
 if test x"$acx_libcuda_ok" = xno; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking static" >&5
-printf %s "checking static... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking static" >&5
+$as_echo_n "checking static... " >&6; }
   LIBCUDA_LIBS="$libcuda_libdir/libcuda.a"
   LIBS="$LIBCUDA_LIBS"
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_libcuda_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15900,13 +15060,13 @@ if test x"$acx_libcuda_ok" = xyes; then
   internal_libcuda=no
   #
 
-printf "%s\n" "#define HAVE_LIBCUDA 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCUDA 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes." >&5
-printf "%s\n" "yes." >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes." >&5
+$as_echo "yes." >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found." >&5
-printf "%s\n" "not found." >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found." >&5
+$as_echo "not found." >&6; }
   use_libcuda=no
   compile_libcuda=no
   internal_libcuda=no
@@ -15963,10 +15123,9 @@ LIBS="$acx_libcuda_save_LIBS"
 #
 
 # Check whether --with-cuda-cc was given.
-if test ${with_cuda_cc+y}
-then :
+if test "${with_cuda_cc+set}" = set; then :
   withval=$with_cuda_cc;
-else $as_nop
+else
   with_cuda_cc=70
 fi
 
@@ -16045,88 +15204,77 @@ fi
 
 
 # Check whether --with-cuda-runtime was given.
-if test ${with_cuda_runtime+y}
-then :
+if test "${with_cuda_runtime+set}" = set; then :
   withval=$with_cuda_runtime;
-else $as_nop
+else
   with_cuda_runtime=10.1
 fi
 
 #
 
 # Check whether --with-cuda-int-libs was given.
-if test ${with_cuda_int_libs+y}
-then :
+if test "${with_cuda_int_libs+set}" = set; then :
   withval=$with_cuda_int_libs;
-else $as_nop
+else
   with_cuda_int_libs=cufft,cublas,cusolver
 fi
 
 #
 # Check whether --enable-nvtx was given.
-if test ${enable_nvtx+y}
-then :
+if test "${enable_nvtx+set}" = set; then :
   enableval=$enable_nvtx;
-else $as_nop
+else
   enable_nvtx="no"
 fi
 
 #
 
 # Check whether --with-gpu_libs was given.
-if test ${with_gpu_libs+y}
-then :
+if test "${with_gpu_libs+set}" = set; then :
   withval=$with_gpu_libs;
 fi
 
 
 # Check whether --with-gpu_incs was given.
-if test ${with_gpu_incs+y}
-then :
+if test "${with_gpu_incs+set}" = set; then :
   withval=$with_gpu_incs;
 fi
 
 #
 
 # Check whether --with-rocm_libs was given.
-if test ${with_rocm_libs+y}
-then :
+if test "${with_rocm_libs+set}" = set; then :
   withval=$with_rocm_libs;
 fi
 
 
 # Check whether --with-rocm_incs was given.
-if test ${with_rocm_incs+y}
-then :
+if test "${with_rocm_incs+set}" = set; then :
   withval=$with_rocm_incs;
 fi
 
 
 # Check whether --with-rocm_libdir was given.
-if test ${with_rocm_libdir+y}
-then :
+if test "${with_rocm_libdir+set}" = set; then :
   withval=$with_rocm_libdir;
 fi
 
 
 # Check whether --with-rocm_includedir was given.
-if test ${with_rocm_includedir+y}
-then :
+if test "${with_rocm_includedir+set}" = set; then :
   withval=$with_rocm_includedir;
 fi
 
 
 # Check whether --with-rocm_path was given.
-if test ${with_rocm_path+y}
-then :
+if test "${with_rocm_path+set}" = set; then :
   withval=$with_rocm_path;
 fi
 
 #
 
 # Check whether --with-mklgpu_libs was given.
-if test ${with_mklgpu_libs+y}
-then :
+if test "${with_mklgpu_libs+set}" = set; then :
   withval=$with_mklgpu_libs;
 fi
 
@@ -16221,12 +15369,11 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f90 files" >&5
-printf %s "checking for Fortran flag to compile .f90 files... " >&6; }
-if test ${ac_cv_fc_srcext_f90+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran flag to compile .f90 files" >&5
+$as_echo_n "checking for Fortran flag to compile .f90 files... " >&6; }
+if ${ac_cv_fc_srcext_f90+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_ext=f90
 ac_fcflags_srcext_save=$ac_fcflags_srcext
 ac_fcflags_srcext=
@@ -16242,18 +15389,17 @@ for ac_flag in none -qsuffix=f=f90 -Tf "-x $ac_try"; do
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   ac_cv_fc_srcext_f90=$ac_flag; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest.$ac_objext conftest.f90
 ac_fcflags_srcext=$ac_fcflags_srcext_save
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f90" >&5
-printf "%s\n" "$ac_cv_fc_srcext_f90" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f90" >&5
+$as_echo "$ac_cv_fc_srcext_f90" >&6; }
 if test "x$ac_cv_fc_srcext_f90" = xunknown; then
   as_fn_error $? "Fortran could not compile .f90 files" "$LINENO" 5
 else
@@ -16273,35 +15419,32 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
-   as_CACHEVAR=`printf "%s\n" "ax_cv_check_fcflags__$GPU_FLAGS" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Fortran compiler accepts $GPU_FLAGS" >&5
-printf %s "checking whether Fortran compiler accepts $GPU_FLAGS... " >&6; }
-if eval test \${$as_CACHEVAR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+   as_CACHEVAR=`$as_echo "ax_cv_check_fcflags__$GPU_FLAGS" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Fortran compiler accepts $GPU_FLAGS" >&5
+$as_echo_n "checking whether Fortran compiler accepts $GPU_FLAGS... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
   ax_check_save_flags=$FCFLAGS
   FCFLAGS="$FCFLAGS  $GPU_FLAGS"
   cat > conftest.$ac_ext <<_ACEOF
 MODULE test; use cudafor; END MODULE
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"
-then :
+if ac_fn_fc_try_compile "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
+else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   FCFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
   have_cudafor=yes
-else $as_nop
+else
   have_cudafor=no
 fi
 
@@ -16403,39 +15546,34 @@ fi
 
 
 # Check whether --with-devxlib_libs was given.
-if test ${with_devxlib_libs+y}
-then :
+if test "${with_devxlib_libs+set}" = set; then :
   withval=$with_devxlib_libs;
 fi
 
 
 # Check whether --with-devxlib_path was given.
-if test ${with_devxlib_path+y}
-then :
+if test "${with_devxlib_path+set}" = set; then :
   withval=$with_devxlib_path;
 fi
 
 
 # Check whether --with-devxlib_libdir was given.
-if test ${with_devxlib_libdir+y}
-then :
+if test "${with_devxlib_libdir+set}" = set; then :
   withval=$with_devxlib_libdir;
 fi
 
 
 # Check whether --with-devxlib_includedir was given.
-if test ${with_devxlib_includedir+y}
-then :
+if test "${with_devxlib_includedir+set}" = set; then :
   withval=$with_devxlib_includedir;
 fi
 
 
 
 # Check whether --with-devxlib-branch was given.
-if test ${with_devxlib_branch+y}
-then :
+if test "${with_devxlib_branch+set}" = set; then :
   withval=$with_devxlib_branch;
-else $as_nop
+else
   with_devxlib_branch=none
 fi
 
@@ -16460,8 +15598,8 @@ acx_devxlib_save_LIBS="$LIBS"
 acx_devxlib_save_FCFLAGS="$FCFLAGS"
 
 #This is fake, it is always going to fail
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for devxlib" >&5
-printf %s "checking for devxlib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for devxlib" >&5
+$as_echo_n "checking for devxlib... " >&6; }
 
 testprog="      program main
 
@@ -16480,11 +15618,10 @@ if test ! -z "$DEVXLIB_LIBS"; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_devxlib_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16495,11 +15632,10 @@ if test x"$acx_devxlib_ok" = xno && test ! -z "$with_devxlib_libs" ; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_devxlib_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16510,11 +15646,10 @@ if test x"$acx_devxlib_ok" = xno; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_devxlib_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16525,11 +15660,10 @@ if test x"$acx_devxlib_ok" = xno; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_devxlib_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16540,11 +15674,10 @@ if test x"$acx_devxlib_ok" = xno; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_devxlib_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16555,11 +15688,10 @@ if test x"$acx_devxlib_ok" = xno; then
   cat > conftest.$ac_ext <<_ACEOF
 $testprog
 _ACEOF
-if ac_fn_fc_try_link "$LINENO"
-then :
+if ac_fn_fc_try_link "$LINENO"; then :
   acx_devxlib_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16569,7 +15701,7 @@ if test x"$acx_devxlib_ok" = xyes; then
   internal_devxlib=no
   #
 
-printf "%s\n" "#define HAVE_DEVXLIB 1" >>confdefs.h
+$as_echo "#define HAVE_DEVXLIB 1" >>confdefs.h
 
 fi
 
@@ -16580,8 +15712,8 @@ if test x"$acx_devxlib_ok" = xno; then
   DEVXLIB_INCS="$IFLAG${extlibs_path}/${FCKIND}/${FC}/${GPU_SUPPORT}/include"
   if test -e "${extlibs_path}/${FCKIND}/${FC}/${GPU_SUPPORT}/lib/libdevXlib.a"; then
     compile_devxlib="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Compatible external DevXlib not found/specified. Found internal already compiled." >&5
-printf "%s\n" "Compatible external DevXlib not found/specified. Found internal already compiled." >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compatible external DevXlib not found/specified. Found internal already compiled." >&5
+$as_echo "Compatible external DevXlib not found/specified. Found internal already compiled." >&6; }
   else
     if test x"$with_devxlib_branch" = "xnone"; then
       DEVXLIB_info="(devxlib tarball)"
@@ -16589,8 +15721,8 @@ printf "%s\n" "Compatible external DevXlib not found/specified. Found internal a
       DEVXLIB_info="(devxlib $with_devxlib_branch branch)"
     fi
     compile_devxlib="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Compatible external DevXlib not found/specified. Internal to be compiled." >&5
-printf "%s\n" "Compatible external DevXlib not found/specified. Internal to be compiled." >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compatible external DevXlib not found/specified. Internal to be compiled." >&5
+$as_echo "Compatible external DevXlib not found/specified. Internal to be compiled." >&6; }
   fi
 fi
 FCFLAGS="$acx_devxlib_save_FCFLAGS"
@@ -16606,6 +15738,256 @@ LIBS="$acx_devxlib_save_LIBS"
 
 
 
+# ============================================================================
+# MAGMA
+
+#
+# Check whether --enable-magma was given.
+if test "${enable_magma+set}" = set; then :
+  enableval=$enable_magma;
+fi
+
+#
+
+# Check whether --with-magma_libs was given.
+if test "${with_magma_libs+set}" = set; then :
+  withval=$with_magma_libs;
+fi
+
+
+# Check whether --with-magma_incs was given.
+if test "${with_magma_incs+set}" = set; then :
+  withval=$with_magma_incs;
+fi
+
+
+# Check whether --with-magma_path was given.
+if test "${with_magma_path+set}" = set; then :
+  withval=$with_magma_path;
+fi
+
+
+# Check whether --with-magma_libdir was given.
+if test "${with_magma_libdir+set}" = set; then :
+  withval=$with_magma_libdir;
+fi
+
+
+# Check whether --with-magma_includedir was given.
+if test "${with_magma_includedir+set}" = set; then :
+  withval=$with_magma_includedir;
+fi
+
+
+#
+def_magma=""
+magma="no"
+internal_magma="no"
+compile_magma="no"
+compile_magma_fmodules="no"
+#
+if test x"$enable_magma" = "x"; then enable_magma="no" ; fi
+#if test x"$enable_magma" = "xyes"; then enable_magma="yes"; fi
+#
+# MAGMA global options
+#
+if test  x"$with_magma_libs" = "xyes" ; then
+  enable_magma="yes" ;
+  compile_magma_fmodules="yes" ;
+  with_magma_libs="";
+elif test  x"$with_magma_libs" = "xno" ; then
+  enable_magma="no" ;
+  compile_magma_fmodules="no" ;
+  with_magma_libs="";
+fi
+#
+if test  x"$with_magma_libdir" != "x" ; then enable_magma="yes" ; fi
+if test  x"$with_magma_path"   != "x" ; then enable_magma="yes" ; fi
+if test  x"$with_magma_libs"   != "x" ; then enable_magma="yes" ; fi
+#
+# Set MAGMA LIBS and FLAGS from INPUT
+#
+if test -d "$with_magma_path" || test -d "$with_magma_libdir" || test x"$with_magma_libs" != "x" ; then
+  #
+  # external magma
+  #
+  if   test   x"$with_magma_libs" != "x" ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Magma using $with_magma_libs" >&5
+$as_echo_n "checking for Magma using $with_magma_libs... " >&6; } ;
+  elif test -d "$with_magma_libdir"      ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Magma in $with_magma_libdir" >&5
+$as_echo_n "checking for Magma in $with_magma_libdir... " >&6; } ;
+  elif test -d "$with_magma_path"        ; then  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Magma in $with_magma_path/lib" >&5
+$as_echo_n "checking for Magma in $with_magma_path/lib... " >&6; } ;
+  fi
+  #
+  if test -d "$with_magma_path" ; then
+      try_magma_libdir="$with_magma_path/lib" ;
+      try_magma_incdir="$with_magma_path/include" ;
+  fi
+  #
+  if test -d "$with_magma_libdir"     ; then try_magma_libdir="$with_magma_libdir" ; fi
+  if test -d "$with_magma_includedir" ; then try_magma_incdir="$with_magma_includedir" ; fi
+  #
+  try_MAGMA_INCS="$IFLAG$try_magma_incdir" ;
+  try_MAGMA_LIBS="-L$try_magma_libdir -lmagma" ;
+  #
+  if test x"$with_magma_libs" != "x" ; then try_MAGMA_LIBS="$with_magma_libs" ; fi
+  if test x"$with_magma_incs" != "x" ; then try_MAGMA_INCS="$with_magma_incs" ; fi
+  #
+  if test -z "$try_MAGMA_LIBS" ; then as_fn_error $? "No libs specified" "$LINENO" 5 ; fi
+  if test -z "$try_MAGMA_INCS" ; then as_fn_error $? "No include-dir specified" "$LINENO" 5 ; fi
+  #
+  ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+  #
+  save_fcflags="$FCFLAGS" ;
+  save_libs="$LIBS" ;
+  #
+  FCFLAGS="$try_MAGMA_INCS $save_fcflags";
+  LIBS="$try_MAGMA_LIBS $save_libs";
+  #
+  # check for magma with fortran-interfaces
+  cat > conftest.$ac_ext <<_ACEOF
+      program main
+
+    use magma
+    implicit none
+    integer :: lda
+    !magma_devptr_t :: dA
+      end
+_ACEOF
+if ac_fn_fc_try_compile "$LINENO"; then :
+  magmaf=yes
+else
+  magmaf=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
+  #
+  # check for c-style magma
+  cat > conftest.$ac_ext <<_ACEOF
+      program main
+
+    ierr = magma_init();
+      end
+_ACEOF
+if ac_fn_fc_try_compile "$LINENO"; then :
+  magmac=yes
+else
+  magmac=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
+  #
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Library: $magmac;  Fortran support: $magmaf" >&5
+$as_echo "Library: $magmac;  Fortran support: $magmaf" >&6; } ;
+  #
+  if test "x$magmaf" = "xyes"; then
+    #
+    MAGMA_INCS="$try_MAGMA_INCS" ;
+    MAGMA_LIBS="$try_MAGMA_LIBS" ;
+    magma=yes;
+    compile_magma="no";
+    internal_magma="no";
+    def_magma="-D_MAGMA"
+    #
+  elif test "x$magmac" = "xyes"; then
+    #
+    MAGMA_LIBS="$try_MAGMA_LIBS" ;
+    MAGMA_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include" ;
+    magma=yes;
+    compile_magma="no";
+    compile_magma_fmodules="yes";
+    def_magma="-D_MAGMA"
+    #
+  else
+    #
+    magma=no;
+    #
+  fi
+  #
+  FCFLAGS="$save_fcflags" ;
+  LIBS="$save_libs" ;
+  #
+fi
+#
+# TO BE FIXED: needs internal compilation support and paths
+#              have to be corrected with GPU_SUPPORT folder
+#
+# Internal compilation
+#
+if test "x$enable_magma" = "xyes" && test "x$magma" = "xno" ; then
+  #
+  # internal magma
+  #
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for internal Magma library" >&5
+$as_echo_n "checking for internal Magma library... " >&6; }
+  #
+  internal_magma="yes"
+  #
+  #if test "x$lapack_shared" = "x1" ; then
+  #  MAGMA_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.so" ;
+  #  #MAGMA_LIBS="" ;
+  #else
+    MAGMA_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.a" ;
+  #fi
+  MAGMA_INCS="${IFLAG}${extlibs_path}/${FCKIND}/${FC}/include" ;
+  #
+  magma=yes
+  def_magma="-D_MAGMA"
+  if test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.a" ; then
+    compile_magma="no" ;
+    compile_magma_fmodules="no" ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; } ;
+  elif test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libmagma.so" ; then
+    compile_magma="no" ;
+    compile_magma_fmodules="no" ;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: already compiled" >&5
+$as_echo "already compiled" >&6; } ;
+  else
+    compile_magma="yes" ;
+    compile_magma_fmodules="no" ;
+    #
+    NVIDIA_ARCH=
+    if test "x$with_cuda_cc" != "x" ; then
+       if test "$with_cuda_cc" -ge 60 &&  ! test "$with_cuda_cc" -ge 70 ; then NVIDIA_ARCH=Pascal ; fi
+       if test "$with_cuda_cc" -ge 70 &&  ! test "$with_cuda_cc" -ge 80 ; then NVIDIA_ARCH=Volta ; fi
+       if test "$with_cuda_cc" -ge 80 &&  ! test "$with_cuda_cc" -ge 90 ; then NVIDIA_ARCH=Hopper ; fi
+    fi
+    #
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compatible external Magma not found/specified. To be compiled." >&5
+$as_echo "Compatible external Magma not found/specified. To be compiled." >&6; } ;
+
+    ac_config_files="$ac_config_files lib/magma/make_magma.inc:lib/magma/make_magma.inc.in"
+
+  fi
+  #
+fi
+
+#
+# switch off internal magma compilation
+#
+deactivate_internal=no
+if test "x$compile_magma" = "xyes" && test "x$internal_magma" = "xyes" && test "x$deactivate_internal" = "xyes"  ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Internal Magma compilation not available yet. Deactivating it." >&5
+$as_echo "Internal Magma compilation not available yet. Deactivating it." >&6; } ;
+  compile_magma="no"
+  def_magma=""
+  enable_magma="no"
+  MAGMA_INCS="" ;
+  MAGMA_LIBS="" ;
+fi
+#
+
+
+
+
+
+
+
+#
+
 # ============================================================================
 # Prepare the REPORT file variables
 
@@ -16743,6 +16125,14 @@ if test "$internal_libxc" = "yes" ; then
   if test "$compile_libxc" = "no" ; then LIBXC_check="I"; fi
 fi
 #
+MAGMA_check="-"
+if test "$internal_magma" = "yes" ; then
+  if test "$compile_magma" = "yes" ; then MAGMA_check="C"; fi
+  if test "$compile_magma" = "no"  ; then MAGMA_check="I"; fi
+elif test "$enable_magma" = "yes" ; then
+  MAGMA_check="E"
+fi
+#
 DEVXLIB_check="E"
 if test "$internal_devxlib" = "yes" ; then
   if test "$compile_devxlib" = "yes"; then DEVXLIB_check="C"; fi
@@ -16835,6 +16225,7 @@ fi
 
 
 
+
 #
 # STRIPE [LIB] from paths
 #
@@ -17090,6 +16481,29 @@ fi
 SCALAPACK_INCS_R=$STRIPE
 
 
+#
+
+TMP1=`echo $MAGMA_LIBS | sed 's/\//+/g'`
+TMP2=`echo $extlibs_path/${FCKIND}/${FC} | sed 's/\//+/g'`
+TMP3=`echo $TMP1 | sed "s/$TMP2/\(LIB\)/g"`
+STRIPE=`echo $TMP3 | sed 's/+/\//g'`
+if [ -z "${1// }" ]; then
+ STRIPE="$STRIPE ("LIB")"
+fi
+
+MAGMA_LIBS_R=$STRIPE
+
+TMP1=`echo $MAGMA_INCS | sed 's/\//+/g'`
+TMP2=`echo $extlibs_path/${FCKIND}/${FC} | sed 's/\//+/g'`
+TMP3=`echo $TMP1 | sed "s/$TMP2/\(LIB\)/g"`
+STRIPE=`echo $TMP3 | sed 's/+/\//g'`
+if [ -z "${1// }" ]; then
+ STRIPE="$STRIPE ("INC")"
+fi
+
+MAGMA_INCS_R=$STRIPE
+
+
 #
 
 TMP1=`echo $BLACS_LIBS | sed 's/\//+/g'`
@@ -17159,6 +16573,29 @@ fi
 SLEPC_INCS_R=$STRIPE
 
 
+#
+
+TMP1=`echo $MAGMA_LIBS | sed 's/\//+/g'`
+TMP2=`echo $extlibs_path/${FCKIND}/${FC} | sed 's/\//+/g'`
+TMP3=`echo $TMP1 | sed "s/$TMP2/\(LIB\)/g"`
+STRIPE=`echo $TMP3 | sed 's/+/\//g'`
+if [ -z "${1// }" ]; then
+ STRIPE="$STRIPE ("LIB")"
+fi
+
+MAGMA_LIBS_R=$STRIPE
+
+TMP1=`echo $MAGMA_INCS | sed 's/\//+/g'`
+TMP2=`echo $extlibs_path/${FCKIND}/${FC} | sed 's/\//+/g'`
+TMP3=`echo $TMP1 | sed "s/$TMP2/\(LIB\)/g"`
+STRIPE=`echo $TMP3 | sed 's/+/\//g'`
+if [ -z "${1// }" ]; then
+ STRIPE="$STRIPE ("INC")"
+fi
+
+MAGMA_INCS_R=$STRIPE
+
+
 #
 
 TMP1=`echo $LIBXC_LIBS | sed 's/\//+/g'`
@@ -17312,8 +16749,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -17343,15 +16780,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -17365,8 +16802,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -17383,7 +16820,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -17399,8 +16836,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -17423,16 +16860,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # 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 $as_nop
+else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -17442,46 +16877,46 @@ esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+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 ||
@@ -17490,6 +16925,13 @@ if ${PATH_SEPARATOR+false} :; then
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -17498,12 +16940,8 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
@@ -17515,10 +16953,30 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -17531,14 +16989,13 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -17565,20 +17022,18 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
-
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else $as_nop
+else
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -17590,13 +17045,12 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else $as_nop
+else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -17627,7 +17081,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -17649,10 +17103,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -17666,12 +17116,6 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -17713,7 +17157,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -17722,7 +17166,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -17785,7 +17229,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by Yambo $as_me 5.3.0 r.23931 h.89a5070b8, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -17843,16 +17287,14 @@ $config_headers
 Report bugs to <yambo@yambo-code.org>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config='$ac_cs_config_escaped'
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Yambo config.status 5.3.0 r.23931 h.89a5070b8
-configured by $0, generated by GNU Autoconf 2.71,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -17889,15 +17331,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -17905,7 +17347,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -17914,7 +17356,7 @@ do
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -17942,7 +17384,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -17956,7 +17398,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -17972,6 +17414,7 @@ do
     "lib/fftqe/c_defs.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/fftqe/c_defs.h:lib/fftqe/c_defs.h.in" ;;
     "lib/fftqe/fftqe_defs.h") CONFIG_FILES="$CONFIG_FILES lib/fftqe/fftqe_defs.h:lib/fftqe/fftqe_defs.h.in" ;;
     "lib/iotk/make_iotk.inc") CONFIG_FILES="$CONFIG_FILES lib/iotk/make_iotk.inc:lib/iotk/make_iotk.inc.in" ;;
+    "lib/magma/make_magma.inc") CONFIG_FILES="$CONFIG_FILES lib/magma/make_magma.inc:lib/magma/make_magma.inc.in" ;;
     "include/headers/common/have_malloc.h") CONFIG_HEADERS="$CONFIG_HEADERS include/headers/common/have_malloc.h:include/headers/common/have_malloc.h.in" ;;
     "config/setup") CONFIG_FILES="$CONFIG_FILES config/setup" ;;
     "config/mk/global/defs.mk") CONFIG_FILES="$CONFIG_FILES config/mk/global/defs.mk" ;;
@@ -17996,8 +17439,8 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
-  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -18333,7 +17776,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -18341,17 +17784,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -18368,7 +17811,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -18392,9 +17835,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -18447,8 +17890,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -18490,9 +17933,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -18508,20 +17951,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -18562,8 +18005,8 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 #
@@ -18705,4 +18148,3 @@ cat config/report
 if test "x$enable_ydb" = "xyes"; then
  cat config/msg_ydb
 fi
-
diff --git a/lib/archive/Makefile.loc b/lib/archive/Makefile.loc
index cd88054321..6b9c18d85e 100644
--- a/lib/archive/Makefile.loc
+++ b/lib/archive/Makefile.loc
@@ -41,6 +41,8 @@ blacs:
 	@+URL="$(url_blacs)"    ; LIB="$(pkgname_blacs)"; $(getsrc)
 scalapack:
 	@+URL="$(url_scalapack)"; LIB="$(pkgname_scalapack)"; $(getsrc)
+magma:
+	@+URL="$(url_magma)"    ; LIB="$(pkgname_magma)"; $(getsrc)
 petsc:
 	@+URL="$(url_petsc)"    ; LIB="$(pkgname_petsc)";  GBRANCH="$(branch_petsc)"  ;  GIT="$(git_petsc)" ;  $(call getsrc_git,"petsc");
 slepc:
@@ -69,6 +71,7 @@ clean_tgz:
           if test -s $(tarball_etsf_io)  && test "$(keep_etsf_io)"   != "yes" ;  then rm $(tarball_etsf_io)   ; fi ; \
           if test -s $(tarball_lapack)   && test "$(keep_lapack)"    != "yes" ;  then rm $(tarball_lapack)    ; fi ; \
           if test -s $(tarball_scalapack)&& test "$(keep_scalapack)" != "yes" ;  then rm $(tarball_scalapack) ; fi ; \
+          if test -s $(tarball_magma)    && test "$(keep_magma)"     != "yes" ;  then rm $(tarball_magma)     ; fi ; \
           if test -s $(tarball_blacs)    && test "$(keep_blacs)"     != "yes" ;  then rm $(tarball_blacs)     ; fi ; \
           if test -s $(tarball_petsc)    && test "$(keep_petsc)"     != "yes" ;  then rm $(tarball_petsc)     ; fi ; \
           if test -s $(tarball_slepc)    && test "$(keep_slepc)"     != "yes" ;  then rm $(tarball_slepc)     ; fi ; \
diff --git a/lib/archive/package.list b/lib/archive/package.list
index ac1acbb482..0e3f66ebf7 100644
--- a/lib/archive/package.list
+++ b/lib/archive/package.list
@@ -1,7 +1,7 @@
 #
 # Libs list
 #
-EXT_LIBS= yaml futile iotk hdf5 netcdf netcdff etsf_io libxc lapack blacs scalapack petsc slepc fftw fftqe devxlib
+EXT_LIBS= yaml futile iotk hdf5 netcdf netcdff etsf_io libxc lapack blacs scalapack magma petsc slepc fftw fftqe devxlib
 #
 # storing options
 #
@@ -13,6 +13,7 @@ keep_libxc=no
 keep_lapack=no
 keep_blacs=no
 keep_scalapack=no
+keep_magma=no
 keep_petsc=no
 keep_slepc=no
 keep_fftw=no
@@ -33,6 +34,7 @@ version_libxc=5.2.3
 version_lapack=3.12.0
 version_blacs=missing
 version_scalapack=2.2.1
+version_magma=2.8.0
 version_slepc=3.22.0
 version_petsc=3.22.0
 version_fftw=3.3.10
@@ -52,6 +54,7 @@ pkgname_libxc=libxc-$(version_libxc)
 pkgname_lapack=lapack-$(version_lapack)
 pkgname_blacs=blacs
 pkgname_scalapack=scalapack-$(version_scalapack)
+pkgname_magma=magma-$(version_magma)
 pkgname_slepc=slepc-$(version_slepc)
 pkgname_petsc=petsc-$(version_petsc)
 pkgname_fftw=fftw-$(version_fftw)
@@ -70,6 +73,7 @@ tarball_etsf_io=$(pkgname_etsf_io).tar.gz
 tarball_libxc=$(pkgname_libxc).tar.gz
 tarball_lapack=v$(version_lapack).tar.gz
 tarball_scalapack=v$(version_scalapack).tar.gz
+tarball_magma=$(pkgname_magma).tar.gz
 tarball_blacs=$(pkgname_blacs).tar.gz
 tarball_slepc=slepc-v$(version_slepc).tar.gz
 tarball_petsc=petsc-v$(version_petsc).tar.gz
@@ -99,6 +103,7 @@ url_libxc=https://gitlab.com/libxc/libxc/-/archive/$(version_libxc)/$(tarball_li
 # External URL's More
 #
 url_fftw=https://fftw.org/$(tarball_fftw)
+url_magma=https://icl.utk.edu/projectsfiles/magma/downloads/$(tarball_magma)
 #
 # Internal URL's
 #
diff --git a/lib/lapack/Makefile.loc b/lib/lapack/Makefile.loc
index 02b69e3836..5d56794a2e 100644
--- a/lib/lapack/Makefile.loc
+++ b/lib/lapack/Makefile.loc
@@ -25,9 +25,9 @@ configure: uncompress
          echo "\t[$(PACKAGE)] configuration"; \
 	 cd $(PACKAGE); \
 	 mkdir build_static ; cd build_static ; \
-	 ( cmake -DCMAKE_C_COMPILER=$(cc) -DCMAKE_Fortran_COMPILER=$(fc) -DCMAKE_INSTALL_PREFIX=$(LIBPATH) -DBUILD_SHARED_LIBS=OFF .. ) >> ${compdir}/log/config_$(PACKAGE)_static.log 2>&1 ; \
+	 ( cmake -DCMAKE_C_COMPILER=$(cc) -DCMAKE_Fortran_COMPILER=$(fc) -DCMAKE_INSTALL_PREFIX=$(LIBPATH) -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib .. ) >> ${compdir}/log/config_$(PACKAGE)_static.log 2>&1 ; \
 	 cd .. ; mkdir build_shared ; cd build_shared ; \
-	 ( cmake -DCMAKE_C_COMPILER=$(cc) -DCMAKE_Fortran_COMPILER=$(fc) -DCMAKE_INSTALL_PREFIX=$(LIBPATH) -DBUILD_SHARED_LIBS=ON .. ) >> ${compdir}/log/config_$(PACKAGE)_shared.log 2>&1 ; \
+	 ( cmake -DCMAKE_C_COMPILER=$(cc) -DCMAKE_Fortran_COMPILER=$(fc) -DCMAKE_INSTALL_PREFIX=$(LIBPATH) -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_LIBDIR=lib .. ) >> ${compdir}/log/config_$(PACKAGE)_shared.log 2>&1 ; \
 	 cd .. ; \
 	 touch ../configured.stamp ; \
 	fi
diff --git a/lib/magma/Makefile.loc b/lib/magma/Makefile.loc
new file mode 100644
index 0000000000..6703f930a2
--- /dev/null
+++ b/lib/magma/Makefile.loc
@@ -0,0 +1,55 @@
+#
+#===============================
+# Yambo package
+#===============================
+#
+include ../../config/setup
+include ../archive/package.list
+#
+LIBNAME=libmagma.a
+LIBPATH=$(libs_prefix)/$(fc_kind)/${fc}/
+LIBRARY=$(LIBPATH)/lib/$(LIBNAME)
+#
+PACKAGE=$(pkgname_magma)
+#
+include ../config/external_libs_commons.mk
+include ../config/external_libs_defs.mk
+#
+#
+all: $(LIBRARY)
+#
+uncompress:
+	@$(uncompress)
+
+configure: uncompress
+	@if test -d $(PACKAGE) && ! test -f configured.stamp ; then \
+         echo "\t[$(PACKAGE)] configuration"; \
+	 cd $(PACKAGE);  \
+	 cat $(compdir)/config/setup $(srcdir)/lib/magma/make_magma.inc > make.inc ; \
+         touch ../configured.stamp;\
+	fi
+
+#	 cp  $(srcdir)/lib/magma/Makefile.lib  Makefile ;  \
+
+compile: uncompress configure
+	@$(call compile)
+	
+install: uncompress configure compile
+	@if ! test -e installed.stamp ; then \
+         echo "\t[$(PACKAGE)] installation"; \
+         cd $(PACKAGE); cp *.a $(LIBPATH)/lib ; \
+         cp include/*.h $(LIBPATH)/include ; \
+         cp include/*.mod $(LIBPATH)/include ; \
+	 touch ../installed.stamp;\
+	fi
+
+$(LIBRARY): uncompress configure compile install
+#
+# cleaning
+#
+clean:
+	@$(call clean_the_lib,clean)
+
+clean_all: clean
+	@$(rm_the_lib)
+#
diff --git a/lib/magma/make_magma.inc.in b/lib/magma/make_magma.inc.in
new file mode 100644
index 0000000000..6921b5dd21
--- /dev/null
+++ b/lib/magma/make_magma.inc.in
@@ -0,0 +1,126 @@
+#//////////////////////////////////////////////////////////////////////////////
+#   -- MAGMA (version 2.8.0) --
+#      Univ. of Tennessee, Knoxville
+#      Univ. of California, Berkeley
+#      Univ. of Colorado, Denver
+#      @date March 2024
+#//////////////////////////////////////////////////////////////////////////////
+
+
+
+# --------------------
+# configuration
+
+# should MAGMA be built on CUDA (NVIDIA only) or ROCM (AMD or NVIDIA)
+# enter 'cuda' or 'hip' respectively
+BACKEND     ?= cuda
+
+# set these to their real paths
+CUDADIR     ?= @LIBCUDA_PATH@
+ROCM_PATH   ?= @LIBROCM_PATH@
+
+USE_FORTRAN ?=yes
+
+# require either hip or cuda
+ifeq (,$(findstring $(BACKEND),hip cuda))
+    $(error "'BACKEND' should be either 'cuda' or 'hip' (got $(BACKEND))")
+endif
+
+# --------------------
+# programs
+
+# set compilers
+CC          ?= gcc
+CXX         ?= g++
+FORT        ?= @FC@
+HIPCC       ?= hipcc
+NVCC        ?= nvcc
+DEVCC       ?= NONE
+
+# set from 'BACKEND'
+ifeq ($(BACKEND),cuda)
+    DEVCC = $(NVCC)
+else ifeq ($(BACKEND),hip)
+    DEVCC = $(HIPCC)
+endif
+
+# and utilities
+ARCH      = ar
+ARCHFLAGS = cr
+RANLIB    = ranlib
+
+
+# --------------------
+# flags/settings
+
+# set our GPU targets
+ifeq ($(BACKEND),cuda)
+    GPU_TARGET = @NVIDIA_ARCH@
+else ifeq ($(BACKEND),hip)
+    GPU_TARGET = gfx900 gfx906 gfx908
+endif
+
+# Use -fPIC to make shared (.so) and static (.a) library;
+# can be commented out if making only static library.
+FPIC      = -fPIC
+
+# now, generate our flags
+CFLAGS      = -O3 $(FPIC) -DNDEBUG -DADD_ -Wall -fopenmp -std=c99
+CXXFLAGS    = -O3 $(FPIC) -DNDEBUG -DADD_ -Wall -fopenmp -std=c++11
+FFLAGS      = -O3 $(FPIC) -DNDEBUG -DADD_ 
+F90FLAGS    = -O3 $(FPIC) -DNDEBUG -DADD_ 
+LDFLAGS     =     $(FPIC)                       -fopenmp
+
+DEVCCFLAGS  = -O3         -DNDEBUG -DADD_
+
+# DEVCCFLAGS are populated later in `backend-specific`
+
+
+# --------------------
+# libraries
+
+# gcc with OpenBLAS (includes LAPACK)
+LIB       += $(lblas) $(llapack)
+
+# --------------------
+# directories
+
+# define library directories preferably in your environment, or here.
+LIBDIR    += -L$(libs_prefix)/$(fc_kind)/${fc}/lib
+INC       += -I$(libs_prefix)/$(fc_kind)/${fc}/include
+
+
+# --------------------
+# checks
+
+# check for openblas
+#-include make.check-openblas
+
+
+# --------------------
+# backend-specific
+
+# add appropriate cuda flags
+ifeq ($(BACKEND),cuda)
+    -include make.check-cuda
+
+    DEVCCFLAGS += -Xcompiler "$(FPIC)" -std=c++11
+
+    # link with cuda specific libraries
+    INC    += -I$(CUDADIR)/include
+    LIBDIR += -L$(CUDADIR)/lib64
+    LIB    += -lcublas -lcusparse -lcudart -lcudadevrt
+endif
+
+# add appropriate ROCM flags
+ifeq ($(BACKEND),hip)
+    -include make.check-hip
+
+    DEVCCFLAGS += $(FPIC) -std=c++11
+
+    INC    += -I$(ROCM_PATH)/include
+    LIBDIR += -L$(ROCM_PATH)/lib
+    LIB    += -lhipblas -lhipsparse
+endif
+
+
diff --git a/lib/magma_fmodules/.objects b/lib/magma_fmodules/.objects
new file mode 100644
index 0000000000..77f516e43f
--- /dev/null
+++ b/lib/magma_fmodules/.objects
@@ -0,0 +1,5 @@
+#if defined _MAGMA
+MAGMA_objects    = magma.o  magma_param.o \
+                   magma_cfortran.o  magma_zfortran.o  
+#endif
+objs = $(MAGMA_objects)
diff --git a/lib/magma_fmodules/magma.F b/lib/magma_fmodules/magma.F
new file mode 100644
index 0000000000..b86b503f84
--- /dev/null
+++ b/lib/magma_fmodules/magma.F
@@ -0,0 +1,373 @@
+!
+!   -- MAGMA (version 2.8.0) --
+!      Univ. of Tennessee, Knoxville
+!      Univ. of California, Berkeley
+!      Univ. of Colorado, Denver
+!      @date March 2024
+!
+
+module magma
+
+    use magma_param
+    use iso_fortran_env, ONLY: int64
+
+#define magma_devptr_t integer(int64)
+
+    use magma_zfortran
+    use magma_cfortran
+!    use magma_dfortran
+!    use magma_sfortran
+
+!    use magmablas_zfortran
+!    use magmablas_dfortran
+!    use magmablas_cfortran
+!    use magmablas_sfortran
+
+    !---- Fortran interfaces to MAGMA subroutines ----
+    interface
+
+    !! -------------------------------------------------------------------------
+    !! initialize
+    subroutine magmaf_init( )
+    end subroutine
+
+    subroutine magmaf_finalize(  )
+    end subroutine
+
+    !! -------------------------------------------------------------------------
+    !! version
+    subroutine magmaf_version( major, minor, micro )
+        integer         :: major, minor, micro
+    end subroutine
+
+    subroutine magmaf_print_environment()
+    end subroutine
+
+    !! -------------------------------------------------------------------------
+    !! device support
+    integer function magmaf_num_gpus()
+    end function
+
+    integer function magmaf_getdevice_arch()
+    end function
+
+    subroutine magmaf_getdevice( dev )
+        integer         :: dev
+    end subroutine
+
+    subroutine magmaf_setdevice( dev )
+        integer         :: dev
+    end subroutine
+
+    function magmaf_mem_size( queue )
+        import int64
+        integer(kind=8) :: magmaf_mem_size
+        magma_devptr_t  :: queue
+    end function
+
+    !! -------------------------------------------------------------------------
+    !! queue support
+    subroutine magmaf_queue_create( dev, queue )
+        import int64
+        integer        :: dev
+        magma_devptr_t :: queue
+    end subroutine
+
+    subroutine magmaf_queue_destroy( queue )
+        import int64
+        magma_devptr_t :: queue
+    end subroutine
+
+    subroutine magmaf_queue_sync( queue )
+        import int64
+        magma_devptr_t :: queue
+    end subroutine
+
+    integer function magmaf_queue_get_device( queue )
+        import int64
+        magma_devptr_t :: queue
+    end function
+
+    !! -------------------------------------------------------------------------
+    !! GPU allocation
+    integer function magmaf_malloc( ptr, bytes )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: bytes
+    end function
+
+    integer function magmaf_smalloc( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_dmalloc( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_cmalloc( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_zmalloc( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_free( ptr )
+        import int64
+        magma_devptr_t  :: ptr
+    end function
+
+    !! -------------------------------------------------------------------------
+    !! CPU regular (non-pinned) allocation
+    integer function magmaf_malloc_cpu( ptr, bytes )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: bytes
+    end function
+
+    integer function magmaf_smalloc_cpu( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_dmalloc_cpu( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_cmalloc_cpu( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_zmalloc_cpu( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_free_cpu( ptr )
+        import int64
+        magma_devptr_t  :: ptr
+    end function
+
+    !! -------------------------------------------------------------------------
+    !! CPU pinned allocation
+    integer function magmaf_malloc_pinned( ptr, bytes )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: bytes
+    end function
+
+    integer function magmaf_smalloc_pinned( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_dmalloc_pinned( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_cmalloc_pinned( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_zmalloc_pinned( ptr, n )
+        import int64
+        magma_devptr_t  :: ptr
+        integer         :: n
+    end function
+
+    integer function magmaf_free_pinned( ptr )
+        import int64
+        magma_devptr_t  :: ptr
+    end function
+
+    !! -------------------------------------------------------------------------
+    !! timing; see magma_timer.cpp
+    subroutine magmaf_wtime( time )
+        double precision :: time
+    end subroutine
+
+    end interface
+
+    !! -------------------------------------------------------------------------
+    ! parameter constants from magma_types.h
+    ! currently MAGMA's Fortran interface uses characters, not integers
+    character, parameter :: &
+        MagmaFalse         = 'n',  &
+        MagmaTrue          = 'y',  &
+        MagmaRowMajor      = 'r',  &
+        MagmaColMajor      = 'c',  &
+        MagmaNoTrans       = 'n',  &
+        MagmaTrans         = 't',  &
+        MagmaConjTrans     = 'c',  &
+        MagmaUpper         = 'u',  &
+        MagmaLower         = 'l',  &
+        MagmaFull          = 'f',  &
+        MagmaNonUnit       = 'n',  &
+        MagmaUnit          = 'u',  &
+        MagmaLeft          = 'l',  &
+        MagmaRight         = 'r',  &
+        MagmaBothSides     = 'b',  &
+        MagmaOneNorm       = '1',  &
+        MagmaTwoNorm       = '2',  &
+        MagmaFrobeniusNorm = 'f',  &
+        MagmaInfNorm       = 'i',  &
+        MagmaMaxNorm       = 'm',  &
+        MagmaDistUniform   = 'u',  &
+        MagmaDistSymmetric = 's',  &
+        MagmaDistNormal    = 'n',  &
+        MagmaHermGeev      = 'h',  &
+        MagmaHermPoev      = 'p',  &
+        MagmaNonsymPosv    = 'n',  &
+        MagmaSymPosv       = 's',  &
+        MagmaNoPacking     = 'n',  &
+        MagmaPackSubdiag   = 'u',  &
+        MagmaPackSupdiag   = 'l',  &
+        MagmaPackColumn    = 'c',  &
+        MagmaPackRow       = 'r',  &
+        MagmaPackLowerBand = 'b',  &
+        MagmaPackUpeprBand = 'q',  &
+        MagmaPackAll       = 'z',  &
+        MagmaNoVec         = 'n',  &
+        MagmaVec           = 'v',  &
+        MagmaIVec          = 'i',  &
+        MagmaAllVec        = 'a',  &
+        MagmaSomeVec       = 's',  &
+        MagmaOverwriteVec  = 'o',  &
+        MagmaBacktransVec  = 'b',  &
+        MagmaRangeAll      = 'a',  &
+        MagmaRangeV        = 'v',  &
+        MagmaRangeI        = 'i',  &
+        MagmaQ             = 'q',  &
+        MagmaP             = 'p',  &
+        MagmaForward       = 'f',  &
+        MagmaBackward      = 'b',  &
+        MagmaColumnwise    = 'c',  &
+        MagmaRowwise       = 'r'
+
+contains
+
+! --------------------
+!> Sets ptrNew = ptrOld( i ), with stride inc.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_soff1d( ptrNew, ptrOld, inc, i )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: inc, i
+
+    ptrNew = ptrOld + (i-1) * inc * sizeof_real
+end subroutine magmaf_soff1d
+
+!> Sets ptrNew = ptrOld( i, j ), with leading dimension lda.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_soff2d( ptrNew, ptrOld, lda, i, j )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: lda, i, j
+
+    ptrNew = ptrOld + ((j-1) * lda + (i-1)) * sizeof_real
+end subroutine magmaf_soff2d
+
+! --------------------
+!> Sets ptrNew = ptrOld( i ), with stride inc.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_doff1d( ptrNew, ptrOld, inc, i )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: inc, i
+
+    ptrNew = ptrOld + (i-1) * inc * sizeof_double
+end subroutine magmaf_doff1d
+
+!> Sets ptrNew = ptrOld( i, j ), with leading dimension lda.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_doff2d( ptrNew, ptrOld, lda, i, j )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: lda, i, j
+
+    ptrNew = ptrOld + ((j-1) * lda + (i-1)) * sizeof_double
+end subroutine magmaf_doff2d
+
+! --------------------
+!> Sets ptrNew = ptrOld( i ), with stride inc.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_coff1d( ptrNew, ptrOld, inc, i )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: inc, i
+
+    ptrNew = ptrOld + (i-1) * inc * sizeof_complex
+end subroutine magmaf_coff1d
+
+!> Sets ptrNew = ptrOld( i, j ), with leading dimension lda.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_coff2d( ptrNew, ptrOld, lda, i, j )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: lda, i, j
+
+    ptrNew = ptrOld + ((j-1) * lda + (i-1)) * sizeof_complex
+end subroutine magmaf_coff2d
+
+! --------------------
+!> Sets ptrNew = ptrOld( i ), with stride inc.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_zoff1d( ptrNew, ptrOld, inc, i )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: inc, i
+
+    ptrNew = ptrOld + (i-1) * inc * sizeof_complex_16
+end subroutine magmaf_zoff1d
+
+!> Sets ptrNew = ptrOld( i, j ), with leading dimension lda.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_zoff2d( ptrNew, ptrOld, lda, i, j )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: lda, i, j
+
+    ptrNew = ptrOld + ((j-1) * lda + (i-1)) * sizeof_complex_16
+end subroutine magmaf_zoff2d
+
+! --------------------
+!> Sets ptrNew = ptrOld( i ), with stride inc.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_ioff1d( ptrNew, ptrOld, inc, i )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: inc, i
+
+    ptrNew = ptrOld + (i-1) * inc * sizeof_integer
+end subroutine magmaf_ioff1d
+
+!> Sets ptrNew = ptrOld( i, j ), with leading dimension lda.
+!! Useful because CUDA pointers are opaque types in Fortran.
+subroutine magmaf_ioff2d( ptrNew, ptrOld, lda, i, j )
+    magma_devptr_t   :: ptrNew
+    magma_devptr_t   :: ptrOld
+    integer          :: lda, i, j
+
+    ptrNew = ptrOld + ((j-1) * lda + (i-1)) * sizeof_integer
+end subroutine magmaf_ioff2d
+
+end module magma
diff --git a/lib/magma_fmodules/magma_cfortran.F b/lib/magma_fmodules/magma_cfortran.F
new file mode 100644
index 0000000000..48d48b9c71
--- /dev/null
+++ b/lib/magma_fmodules/magma_cfortran.F
@@ -0,0 +1,2086 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!  This file is AUTOMATICALLY GENERATED by:
+!!  tools/fortran_wrappers.pl include/magma_c.i
+!!  Do not edit.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+module magma_cfortran
+
+use magma_param
+use iso_fortran_env, ONLY: int64
+
+#define magma_devptr_t integer(int64)
+
+implicit none
+
+!---- Fortran interfaces to MAGMA subroutines ----
+interface
+
+integer function magmaf_get_cpotrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_cgetrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cgetri_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_chetrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_chetrf_nopiv_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_chetrf_aasen_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_cgeqp3_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cgeqrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cgeqlf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cgelqf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cgehrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_chetrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_chegst_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_chegst_m_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_cgebrd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cgesvd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_cbulge_nb( n, nbthreads )
+    integer          :: n
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_cbulge_vblksiz( n, nb, nbthreads )
+    integer          :: n
+    integer          :: nb
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_cbulge_gcperf(  )
+end
+
+subroutine magmaf_cgebrd( m, n, A, lda, d, e, tauq, taup, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: tauq(*)
+    complex          :: taup(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeev( jobvl, jobvr, n, A, lda, w, VL, ldvl, VR, ldvr, work, lwork,  &
+        rwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: w(*)
+    complex          :: VL(*)
+    integer          :: ldvl
+    complex          :: VR(*)
+    integer          :: ldvr
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgeev_m( jobvl, jobvr, n, A, lda, w, VL, ldvl, VR, ldvr, work, lwork,  &
+        rwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: w(*)
+    complex          :: VL(*)
+    integer          :: ldvl
+    complex          :: VR(*)
+    integer          :: ldvr
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgegqr_gpu( ikind, m, n, dA, ldda, dwork, work, info )
+    import int64
+    integer          :: ikind
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dwork
+    complex          :: work(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgehrd( n, ilo, ihi, A, lda, tau, work, lwork, dT, info )
+    import int64
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_cgehrd_m( n, ilo, ihi, A, lda, tau, work, lwork, T, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    complex          :: T(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgehrd2( n, ilo, ihi, A, lda, tau, work, lwork, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgelqf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgelqf_gpu( m, n, dA, ldda, tau, work, lwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgels( trans, m, n, nrhs, A, lda, B, ldb, hwork, lwork, info )
+    import int64
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: A
+    integer          :: lda
+    magma_devptr_t   :: B
+    integer          :: ldb
+    complex          :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cggrqf( m, p, n, A, lda, taua, B, ldb, taub, work, lwork, info )
+    integer          :: m
+    integer          :: p
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: taua(*)
+    complex          :: B(*)
+    integer          :: ldb
+    complex          :: taub(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgglse( m, n, p, A, lda, B, ldb, c, d, x, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    integer          :: p
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    complex          :: c(*)
+    complex          :: d(*)
+    complex          :: x(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgels_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    import int64
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex          :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgels3_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    import int64
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex          :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqlf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqp3( m, n, A, lda, jpvt, tau, work, lwork, rwork, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: jpvt(*)
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgeqp3_gpu( m, n, dA, ldda, jpvt, tau, dwork, lwork, rwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: jpvt(*)
+    complex          :: tau(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgeqr2x_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqr2x2_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqr2x3_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqr2x4_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, queue, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrf_gpu( m, n, dA, ldda, tau, dT, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrf_m( ngpu, m, n, A, lda, tau, work, lwork, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrf_ooc( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrf2_gpu( m, n, dA, ldda, tau, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrf3_gpu( m, n, dA, ldda, tau, dT, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrs_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork, info  &
+        )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex          :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgeqrs3_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork,  &
+        info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex          :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgerbt_gpu( gen, n, nrhs, dA, ldda, dB, lddb, U, V, info )
+    import int64
+    character        :: gen
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex          :: U(*)
+    complex          :: V(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgerfs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, dX, lddx, dworkd,  &
+        dAF, iter, info )
+    import int64
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    magma_devptr_t   :: dX
+    integer          :: lddx
+    magma_devptr_t   :: dworkd
+    magma_devptr_t   :: dAF
+    integer          :: iter
+    integer          :: info
+end
+
+subroutine magmaf_cgesdd( jobz, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork, rwork,  &
+        iwork, info )
+    character        :: jobz
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: s(*)
+    complex          :: U(*)
+    integer          :: ldu
+    complex          :: VT(*)
+    integer          :: ldvt
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgesv( n, nrhs, A, lda, ipiv, B, ldb, info )
+    integer          :: n
+    integer          :: nrhs
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    complex          :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_cgesv_gpu( n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    import int64
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_cgesv_nopiv_gpu( n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_cgesv_rbt( ref, n, nrhs, A, lda, B, ldb, info )
+    character        :: ref
+    integer          :: n
+    integer          :: nrhs
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_cgesvd( jobu, jobvt, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork,  &
+        rwork, info )
+    character        :: jobu
+    character        :: jobvt
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: s(*)
+    complex          :: U(*)
+    integer          :: ldu
+    complex          :: VT(*)
+    integer          :: ldvt
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgetf2_gpu( m, n, dA, ldda, ipiv, queue, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_cgetf2_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_cgetrf( m, n, A, lda, ipiv, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgetrf_gpu( m, n, dA, ldda, ipiv, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgetrf_m( ngpu, m, n, A, lda, ipiv, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_cgetrf_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_cgetrf_nopiv_gpu( m, n, dA, ldda, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_cgetri_gpu( n, dA, ldda, ipiv, dwork, lwork, info )
+    import int64
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cgetrs_gpu( trans, n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    import int64
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_cgetrs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_cheevd( jobz, uplo, n, A, lda, w, work, lwork, rwork, lrwork, iwork,  &
+        liwork, info )
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevd_gpu( jobz, uplo, n, dA, ldda, w, wA, ldwa, work, lwork, rwork,  &
+        lrwork, iwork, liwork, info )
+    import int64
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: w(*)
+    complex          :: wA(*)
+    integer          :: ldwa
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevd_m( ngpu, jobz, uplo, n, A, lda, w, work, lwork, rwork, lrwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevdx( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w, work,  &
+        lwork, rwork, lrwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevdx_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, mout, w,  &
+        wA, ldwa, work, lwork, rwork, lrwork, iwork, liwork, info )
+    import int64
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: wA(*)
+    integer          :: ldwa
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevdx_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevdx_2stage( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, rwork, lrwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevdx_2stage_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu,  &
+        mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevr( jobz, range, uplo, n, A, lda, vl, vu, il, iu, abstol, mout, w,  &
+        Z, ldz, isuppz, work, lwork, rwork, lrwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: abstol
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: Z(*)
+    integer          :: ldz
+    integer          :: isuppz(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevr_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, abstol,  &
+        mout, w, dZ, lddz, isuppz, wA, ldwa, wZ, ldwz, work, lwork, rwork, lrwork, iwork,  &
+        liwork, info )
+    import int64
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: abstol
+    integer          :: mout(*)
+    real             :: w(*)
+    magma_devptr_t   :: dZ
+    integer          :: lddz
+    integer          :: isuppz(*)
+    complex          :: wA(*)
+    integer          :: ldwa
+    complex          :: wZ(*)
+    integer          :: ldwz
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_cheevx( jobz, range, uplo, n, A, lda, vl, vu, il, iu, abstol, mout, w,  &
+        Z, ldz, work, lwork, rwork, iwork, ifail, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: abstol
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: Z(*)
+    integer          :: ldz
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: ifail(*)
+    integer          :: info
+end
+
+subroutine magmaf_cheevx_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, abstol,  &
+        mout, w, dZ, lddz, wA, ldwa, wZ, ldwz, work, lwork, rwork, iwork, ifail, info )
+    import int64
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: abstol
+    integer          :: mout(*)
+    real             :: w(*)
+    magma_devptr_t   :: dZ
+    integer          :: lddz
+    complex          :: wA(*)
+    integer          :: ldwa
+    complex          :: wZ(*)
+    integer          :: ldwz
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: ifail(*)
+    integer          :: info
+end
+
+subroutine magmaf_chegst( itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_chegst_gpu( itype, uplo, n, dA, ldda, dB, lddb, info )
+    import int64
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_chegst_m( ngpu, itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_chegvd( itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork, rwork,  &
+        lrwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvd_m( ngpu, itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork,  &
+        rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvdx( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvdx_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvdx_2stage( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvdx_2stage_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb,  &
+        vl, vu, il, iu, mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvr( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        abstol, mout, w, Z, ldz, isuppz, work, lwork, rwork, lrwork, iwork, liwork, info  &
+        )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: abstol
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: Z(*)
+    integer          :: ldz
+    integer          :: isuppz(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_chegvx( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        abstol, mout, w, Z, ldz, work, lwork, rwork, iwork, ifail, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: abstol
+    integer          :: mout(*)
+    real             :: w(*)
+    complex          :: Z(*)
+    integer          :: ldz
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: ifail(*)
+    integer          :: info
+end
+
+subroutine magmaf_chesv( uplo, n, nrhs, A, lda, ipiv, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    complex          :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_chesv_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_chetrd( uplo, n, A, lda, d, e, tau, work, lwork, info )
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_chetrd_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: tau(*)
+    complex          :: wA(*)
+    integer          :: ldwa
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_chetrd2_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork,  &
+        dwork, ldwork, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: tau(*)
+    complex          :: wA(*)
+    integer          :: ldwa
+    complex          :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    integer          :: info
+end
+
+integer function magmaf_chetrd_hb2st( uplo, n, nb, Vblksiz, A, lda, d, e, V, ldv, TAU,  &
+        compT, T, ldt )
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    integer          :: Vblksiz
+    complex          :: A(*)
+    integer          :: lda
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: V(*)
+    integer          :: ldv
+    complex          :: TAU(*)
+    integer          :: compT
+    complex          :: T(*)
+    integer          :: ldt
+end
+
+subroutine magmaf_chetrd_he2hb( uplo, n, nb, A, lda, tau, work, lwork, dT, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_chetrf( uplo, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_chetrf_aasen( uplo, cpu_panel, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: cpu_panel
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_chetrf_nopiv( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_chetrf_nopiv_cpu( uplo, n, ib, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: ib
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_chetrf_nopiv_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_chetrs_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+integer function magmaf_clarf_gpu( m, n, dv, dtau, dC, lddc, queue )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dv
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: queue
+end
+
+integer function magmaf_clarfb2_gpu( m, n, k, dV, lddv, dT, lddt, dC, lddc, dwork,  &
+        ldwork, queue )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dV
+    integer          :: lddv
+    magma_devptr_t   :: dT
+    integer          :: lddt
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_clatrsd( uplo, trans, diag, normin, n, A, lda, lambda, x, scale, cnorm,  &
+        info )
+    character        :: uplo
+    character        :: trans
+    character        :: diag
+    character        :: normin
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: lambda
+    complex          :: x(*)
+    real             :: scale(*)
+    real             :: cnorm(*)
+    integer          :: info
+end
+
+subroutine magmaf_clauum( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_clauum_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_cposv( uplo, n, nrhs, A, lda, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_cposv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_cpotf2_gpu( uplo, n, dA, ldda, queue, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_cpotrf( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_cpotrf_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_cpotrf_m( ngpu, uplo, n, A, lda, info )
+    integer          :: ngpu
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_cpotri( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_cpotri_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_cpotrs_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_csysv_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_csytrf_nopiv_cpu( uplo, n, ib, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: ib
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_csytrf_nopiv_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_csytrs_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_cstedx( range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork, iwork,  &
+        liwork, dwork, info )
+    import int64
+    character        :: range
+    integer          :: n
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: Z(*)
+    integer          :: ldz
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_cstedx_m( ngpu, range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    character        :: range
+    integer          :: n
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: d(*)
+    real             :: e(*)
+    complex          :: Z(*)
+    integer          :: ldz
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ctrevc3( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, rwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    complex          :: T(*)
+    integer          :: ldt
+    complex          :: VL(*)
+    integer          :: ldvl
+    complex          :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_ctrevc3_mt( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, rwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    complex          :: T(*)
+    integer          :: ldt
+    complex          :: VL(*)
+    integer          :: ldvl
+    complex          :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    complex          :: work(*)
+    integer          :: lwork
+    real             :: rwork(*)
+    integer          :: info
+end
+
+integer function magmaf_ctrsm_m( ngpu, side, uplo, transa, diag, m, n, alpha, A, lda, B,  &
+        ldb )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: transa
+    character        :: diag
+    integer          :: m
+    integer          :: n
+    complex          :: alpha
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: B(*)
+    integer          :: ldb
+end
+
+subroutine magmaf_ctrtri( uplo, diag, n, A, lda, info )
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_ctrtri_gpu( uplo, diag, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_cungbr( vect, m, n, k, A, lda, tau, work, lwork, info )
+    character        :: vect
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunghr( n, ilo, ihi, A, lda, tau, dT, nb, info )
+    import int64
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cunghr_m( n, ilo, ihi, A, lda, tau, T, nb, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cunglq( m, n, k, A, lda, tau, dT, nb, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cungqr( m, n, k, A, lda, tau, dT, nb, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cungqr_gpu( m, n, k, dA, ldda, tau, dT, nb, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cungqr_m( m, n, k, A, lda, tau, T, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cungqr2( m, n, k, A, lda, tau, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_cunmbr( vect, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    character        :: vect
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmlq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmrq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmql( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmql2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    import int64
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex          :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_cunmqr( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmqr_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, hwork,  &
+        lwork, dT, nb, info )
+    import int64
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex          :: hwork(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_cunmqr2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    import int64
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex          :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_cunmqr_m( ngpu, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    integer          :: ngpu
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmtr( side, uplo, trans, m, n, A, lda, tau, C, ldc, work, lwork, info  &
+        )
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_cunmtr_gpu( side, uplo, trans, m, n, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    import int64
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex          :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex          :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_cunmtr_m( ngpu, side, uplo, trans, m, n, A, lda, tau, C, ldc, work,  &
+        lwork, info )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: tau(*)
+    complex          :: C(*)
+    integer          :: ldc
+    complex          :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+integer function magmaf_c_isnan( x )
+    complex          :: x
+end
+
+integer function magmaf_c_isinf( x )
+    complex          :: x
+end
+
+integer function magmaf_c_isnan_inf( x )
+    complex          :: x
+end
+
+integer function magmaf_cnan_inf( uplo, m, n, A, lda, cnt_nan, cnt_inf )
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+end
+
+integer function magmaf_cnan_inf_gpu( uplo, m, n, dA, ldda, cnt_nan, cnt_inf, queue )
+    import int64
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_cprint( m, n, A, lda )
+    integer          :: m
+    integer          :: n
+    complex          :: A(*)
+    integer          :: lda
+end
+
+subroutine magmaf_cprint_gpu( m, n, dA, ldda, queue )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_cpanel_to_q( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: work(*)
+end
+
+subroutine magmaf_cq_to_panel( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    complex          :: A(*)
+    integer          :: lda
+    complex          :: work(*)
+end
+
+end interface
+
+end module magma_cfortran
diff --git a/lib/magma_fmodules/magma_dfortran.F b/lib/magma_fmodules/magma_dfortran.F
new file mode 100644
index 0000000000..22b3dcc2cc
--- /dev/null
+++ b/lib/magma_fmodules/magma_dfortran.F
@@ -0,0 +1,1830 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!  This file is AUTOMATICALLY GENERATED by:
+!!  tools/fortran_wrappers.pl include/magma_d.i
+!!  Do not edit.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+module magma_dfortran
+
+use magma_param
+
+implicit none
+
+!---- Fortran interfaces to MAGMA subroutines ----
+interface
+
+integer function magmaf_get_dlaex3_m_nb(  )
+end
+
+integer function magmaf_get_dpotrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dgetrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dgetri_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dsytrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dsytrf_nopiv_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dsytrf_aasen_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dgeqp3_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dgeqrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dgeqlf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dgelqf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dgehrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dsytrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dsygst_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dsygst_m_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_dgebrd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dgesvd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_dbulge_nb( n, nbthreads )
+    integer          :: n
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_dbulge_vblksiz( n, nb, nbthreads )
+    integer          :: n
+    integer          :: nb
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_dbulge_gcperf(  )
+end
+
+subroutine magmaf_dmove_eig( range, n, w, il, iu, vl, vu, mout )
+    character        :: range
+    integer          :: n
+    double precision :: w(*)
+    integer          :: il(*)
+    integer          :: iu(*)
+    double precision :: vl
+    double precision :: vu
+    integer          :: mout(*)
+end
+
+subroutine magmaf_dvrange( k, d, il, iu, vl, vu )
+    integer          :: k
+    double precision :: d(*)
+    integer          :: il(*)
+    integer          :: iu(*)
+    double precision :: vl
+    double precision :: vu
+end
+
+subroutine magmaf_dirange( k, indxq, iil, iiu, il, iu )
+    integer          :: k
+    integer          :: indxq(*)
+    integer          :: iil(*)
+    integer          :: iiu(*)
+    integer          :: il
+    integer          :: iu
+end
+
+subroutine magmaf_dgebrd( m, n, A, lda, d, e, tauq, taup, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: tauq(*)
+    double precision :: taup(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeev( jobvl, jobvr, n, A, lda, wr, wi, VL, ldvl, VR, ldvr, work,  &
+        lwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: wr(*)
+    double precision :: wi(*)
+    double precision :: VL(*)
+    integer          :: ldvl
+    double precision :: VR(*)
+    integer          :: ldvr
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeev_m( jobvl, jobvr, n, A, lda, wr, wi, VL, ldvl, VR, ldvr, work,  &
+        lwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: wr(*)
+    double precision :: wi(*)
+    double precision :: VL(*)
+    integer          :: ldvl
+    double precision :: VR(*)
+    integer          :: ldvr
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgegqr_gpu( ikind, m, n, dA, ldda, dwork, work, info )
+    integer          :: ikind
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dwork
+    double precision :: work(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgehrd( n, ilo, ihi, A, lda, tau, work, lwork, dT, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_dgehrd_m( n, ilo, ihi, A, lda, tau, work, lwork, T, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    double precision :: T(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgehrd2( n, ilo, ihi, A, lda, tau, work, lwork, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgelqf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgelqf_gpu( m, n, dA, ldda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgels( trans, m, n, nrhs, A, lda, B, ldb, hwork, lwork, info )
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: A
+    integer          :: lda
+    magma_devptr_t   :: B
+    integer          :: ldb
+    double precision :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dggrqf( m, p, n, A, lda, taua, B, ldb, taub, work, lwork, info )
+    integer          :: m
+    integer          :: p
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: taua(*)
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: taub(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgglse( m, n, p, A, lda, B, ldb, c, d, x, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    integer          :: p
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: c(*)
+    double precision :: d(*)
+    double precision :: x(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgels_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    double precision :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgels3_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    double precision :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqlf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqp3( m, n, A, lda, jpvt, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: jpvt(*)
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqp3_gpu( m, n, dA, ldda, jpvt, tau, dwork, lwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: jpvt(*)
+    double precision :: tau(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqr2x_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqr2x2_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqr2x3_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqr2x4_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, queue, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrf_gpu( m, n, dA, ldda, tau, dT, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrf_m( ngpu, m, n, A, lda, tau, work, lwork, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrf_ooc( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrf2_gpu( m, n, dA, ldda, tau, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrf3_gpu( m, n, dA, ldda, tau, dT, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrs_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork, info  &
+        )
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    double precision :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgeqrs3_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork,  &
+        info )
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    double precision :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgerbt_gpu( gen, n, nrhs, dA, ldda, dB, lddb, U, V, info )
+    character        :: gen
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    double precision :: U(*)
+    double precision :: V(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgerfs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, dX, lddx, dworkd,  &
+        dAF, iter, info )
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    magma_devptr_t   :: dX
+    integer          :: lddx
+    magma_devptr_t   :: dworkd
+    magma_devptr_t   :: dAF
+    integer          :: iter
+    integer          :: info
+end
+
+subroutine magmaf_dgesdd( jobz, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork, iwork,  &
+        info )
+    character        :: jobz
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: s(*)
+    double precision :: U(*)
+    integer          :: ldu
+    double precision :: VT(*)
+    integer          :: ldvt
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgesv( n, nrhs, A, lda, ipiv, B, ldb, info )
+    integer          :: n
+    integer          :: nrhs
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    double precision :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_dgesv_gpu( n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dgesv_nopiv_gpu( n, nrhs, dA, ldda, dB, lddb, info )
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dgesv_rbt( ref, n, nrhs, A, lda, B, ldb, info )
+    character        :: ref
+    integer          :: n
+    integer          :: nrhs
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_dgesvd( jobu, jobvt, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork,  &
+        info )
+    character        :: jobu
+    character        :: jobvt
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: s(*)
+    double precision :: U(*)
+    integer          :: ldu
+    double precision :: VT(*)
+    integer          :: ldvt
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgetf2_gpu( m, n, dA, ldda, ipiv, queue, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_dgetf2_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dgetrf( m, n, A, lda, ipiv, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgetrf_gpu( m, n, dA, ldda, ipiv, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgetrf_m( ngpu, m, n, A, lda, ipiv, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_dgetrf_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dgetrf_nopiv_gpu( m, n, dA, ldda, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_dgetri_gpu( n, dA, ldda, ipiv, dwork, lwork, info )
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dgetrs_gpu( trans, n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dgetrs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dsyevd( jobz, uplo, n, A, lda, w, work, lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevd_gpu( jobz, uplo, n, dA, ldda, w, wA, ldwa, work, lwork, iwork,  &
+        liwork, info )
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: w(*)
+    double precision :: wA(*)
+    integer          :: ldwa
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevd_m( ngpu, jobz, uplo, n, A, lda, w, work, lwork, iwork, liwork,  &
+        info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevdx( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w, work,  &
+        lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevdx_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, mout, w,  &
+        wA, ldwa, work, lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: wA(*)
+    integer          :: ldwa
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevdx_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevdx_2stage( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsyevdx_2stage_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu,  &
+        mout, w, work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsygst( itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_dsygst_gpu( itype, uplo, n, dA, ldda, dB, lddb, info )
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dsygst_m( ngpu, itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_dsygvd( itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork, iwork,  &
+        liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsygvd_m( ngpu, itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsygvdx( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        mout, w, work, lwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsygvdx_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsygvdx_2stage( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsygvdx_2stage_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb,  &
+        vl, vu, il, iu, mout, w, work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dsysv( uplo, n, nrhs, A, lda, ipiv, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    double precision :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_dsysv_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dsytrd( uplo, n, A, lda, d, e, tau, work, lwork, info )
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dsytrd_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: tau(*)
+    double precision :: wA(*)
+    integer          :: ldwa
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dsytrd2_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork,  &
+        dwork, ldwork, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: tau(*)
+    double precision :: wA(*)
+    integer          :: ldwa
+    double precision :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    integer          :: info
+end
+
+integer function magmaf_dsytrd_sb2st( uplo, n, nb, Vblksiz, A, lda, d, e, V, ldv, TAU,  &
+        compT, T, ldt )
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    integer          :: Vblksiz
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: V(*)
+    integer          :: ldv
+    double precision :: TAU(*)
+    integer          :: compT
+    double precision :: T(*)
+    integer          :: ldt
+end
+
+subroutine magmaf_dsytrd_sy2sb( uplo, n, nb, A, lda, tau, work, lwork, dT, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_dsytrf( uplo, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_dsytrf_aasen( uplo, cpu_panel, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: cpu_panel
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_dsytrf_nopiv( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dsytrf_nopiv_cpu( uplo, n, ib, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: ib
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dsytrf_nopiv_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_dsytrs_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dlaln2( trans, na, nw, smin, ca, A, lda, d1, d2, B, ldb, wr, wi, X,  &
+        ldx, scale, xnorm, info )
+    integer          :: trans
+    integer          :: na
+    integer          :: nw
+    double precision :: smin
+    double precision :: ca
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: d1
+    double precision :: d2
+    double precision :: B(*)
+    integer          :: ldb
+    double precision :: wr
+    double precision :: wi
+    double precision :: X(*)
+    integer          :: ldx
+    double precision :: scale(*)
+    double precision :: xnorm(*)
+    integer          :: info
+end
+
+subroutine magmaf_dlaqtrsd( trans, n, T, ldt, x, ldx, cnorm, info )
+    character        :: trans
+    integer          :: n
+    double precision :: T(*)
+    integer          :: ldt
+    double precision :: x(*)
+    integer          :: ldx
+    double precision :: cnorm(*)
+    integer          :: info
+end
+
+integer function magmaf_dlarf_gpu( m, n, dv, dtau, dC, lddc, queue )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dv
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: queue
+end
+
+integer function magmaf_dlarfb2_gpu( m, n, k, dV, lddv, dT, lddt, dC, lddc, dwork,  &
+        ldwork, queue )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dV
+    integer          :: lddv
+    magma_devptr_t   :: dT
+    integer          :: lddt
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_dlauum( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dlauum_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_dposv( uplo, n, nrhs, A, lda, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_dposv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dpotf2_gpu( uplo, n, dA, ldda, queue, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_dpotrf( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dpotrf_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_dpotrf_m( ngpu, uplo, n, A, lda, info )
+    integer          :: ngpu
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dpotri( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dpotri_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_dpotrs_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_dstedx( range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork, iwork,  &
+        liwork, dwork, info )
+    character        :: range
+    integer          :: n
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: Z(*)
+    integer          :: ldz
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_dstedx_m( ngpu, range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    character        :: range
+    integer          :: n
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: d(*)
+    double precision :: e(*)
+    double precision :: Z(*)
+    integer          :: ldz
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_dtrevc3( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    double precision :: T(*)
+    integer          :: ldt
+    double precision :: VL(*)
+    integer          :: ldvl
+    double precision :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dtrevc3_mt( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    double precision :: T(*)
+    integer          :: ldt
+    double precision :: VL(*)
+    integer          :: ldvl
+    double precision :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+integer function magmaf_dtrsm_m( ngpu, side, uplo, transa, diag, m, n, alpha, A, lda, B,  &
+        ldb )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: transa
+    character        :: diag
+    integer          :: m
+    integer          :: n
+    double precision :: alpha
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: B(*)
+    integer          :: ldb
+end
+
+subroutine magmaf_dtrtri( uplo, diag, n, A, lda, info )
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_dtrtri_gpu( uplo, diag, n, dA, ldda, info )
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_dorgbr( vect, m, n, k, A, lda, tau, work, lwork, info )
+    character        :: vect
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dorghr( n, ilo, ihi, A, lda, tau, dT, nb, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dorghr_m( n, ilo, ihi, A, lda, tau, T, nb, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dorglq( m, n, k, A, lda, tau, dT, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dorgqr( m, n, k, A, lda, tau, dT, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dorgqr_gpu( m, n, k, dA, ldda, tau, dT, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dorgqr_m( m, n, k, A, lda, tau, T, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dorgqr2( m, n, k, A, lda, tau, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_dormbr( vect, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    character        :: vect
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormlq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormrq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormql( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormql2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    double precision :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_dormqr( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormqr_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, hwork,  &
+        lwork, dT, nb, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    double precision :: hwork(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_dormqr2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    double precision :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_dormqr_m( ngpu, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    integer          :: ngpu
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormtr( side, uplo, trans, m, n, A, lda, tau, C, ldc, work, lwork, info  &
+        )
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_dormtr_gpu( side, uplo, trans, m, n, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    double precision :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_dormtr_m( ngpu, side, uplo, trans, m, n, A, lda, tau, C, ldc, work,  &
+        lwork, info )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: tau(*)
+    double precision :: C(*)
+    integer          :: ldc
+    double precision :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+integer function magmaf_d_isnan( x )
+    double precision :: x
+end
+
+integer function magmaf_d_isinf( x )
+    double precision :: x
+end
+
+integer function magmaf_d_isnan_inf( x )
+    double precision :: x
+end
+
+double precision function magmaf_dmake_lwork( lwork )
+    integer          :: lwork
+end
+
+integer function magmaf_dnan_inf( uplo, m, n, A, lda, cnt_nan, cnt_inf )
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+end
+
+integer function magmaf_dnan_inf_gpu( uplo, m, n, dA, ldda, cnt_nan, cnt_inf, queue )
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_dprint( m, n, A, lda )
+    integer          :: m
+    integer          :: n
+    double precision :: A(*)
+    integer          :: lda
+end
+
+subroutine magmaf_dprint_gpu( m, n, dA, ldda, queue )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_dpanel_to_q( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: work(*)
+end
+
+subroutine magmaf_dq_to_panel( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    double precision :: A(*)
+    integer          :: lda
+    double precision :: work(*)
+end
+
+end interface
+
+end module magma_dfortran
diff --git a/lib/magma_fmodules/magma_param.F b/lib/magma_fmodules/magma_param.F
new file mode 100644
index 0000000000..8fd7c5f978
--- /dev/null
+++ b/lib/magma_fmodules/magma_param.F
@@ -0,0 +1,25 @@
+!
+!   -- MAGMA (version 2.8.0) --
+!      Univ. of Tennessee, Knoxville
+!      Univ. of California, Berkeley
+!      Univ. of Colorado, Denver
+!      @date March 2024
+!
+
+module magma_param
+
+    implicit none
+
+    ! could use STORAGE_SIZE in Fortran 2008
+    integer, parameter :: sizeof_complex_16 = 16
+    integer, parameter :: sizeof_complex    = 8
+    integer, parameter :: sizeof_double     = 8
+    integer, parameter :: sizeof_real       = 4
+    
+#if defined(MAGMA_ILP64) || defined(MKL_ILP64)
+    integer, parameter :: sizeof_integer    = 8
+#else
+    integer, parameter :: sizeof_integer    = 4
+#endif
+
+end module magma_param
diff --git a/lib/magma_fmodules/magma_sfortran.F b/lib/magma_fmodules/magma_sfortran.F
new file mode 100644
index 0000000000..6a50cb38ce
--- /dev/null
+++ b/lib/magma_fmodules/magma_sfortran.F
@@ -0,0 +1,1830 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!  This file is AUTOMATICALLY GENERATED by:
+!!  tools/fortran_wrappers.pl include/magma_s.i
+!!  Do not edit.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+module magma_sfortran
+
+use magma_param
+
+implicit none
+
+!---- Fortran interfaces to MAGMA subroutines ----
+interface
+
+integer function magmaf_get_slaex3_m_nb(  )
+end
+
+integer function magmaf_get_spotrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_sgetrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sgetri_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_ssytrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_ssytrf_nopiv_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_ssytrf_aasen_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_sgeqp3_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sgeqrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sgeqlf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sgelqf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sgehrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_ssytrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_ssygst_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_ssygst_m_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_sgebrd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sgesvd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_sbulge_nb( n, nbthreads )
+    integer          :: n
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_sbulge_vblksiz( n, nb, nbthreads )
+    integer          :: n
+    integer          :: nb
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_sbulge_gcperf(  )
+end
+
+subroutine magmaf_smove_eig( range, n, w, il, iu, vl, vu, mout )
+    character        :: range
+    integer          :: n
+    real             :: w(*)
+    integer          :: il(*)
+    integer          :: iu(*)
+    real             :: vl
+    real             :: vu
+    integer          :: mout(*)
+end
+
+subroutine magmaf_svrange( k, d, il, iu, vl, vu )
+    integer          :: k
+    real             :: d(*)
+    integer          :: il(*)
+    integer          :: iu(*)
+    real             :: vl
+    real             :: vu
+end
+
+subroutine magmaf_sirange( k, indxq, iil, iiu, il, iu )
+    integer          :: k
+    integer          :: indxq(*)
+    integer          :: iil(*)
+    integer          :: iiu(*)
+    integer          :: il
+    integer          :: iu
+end
+
+subroutine magmaf_sgebrd( m, n, A, lda, d, e, tauq, taup, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: d(*)
+    real             :: e(*)
+    real             :: tauq(*)
+    real             :: taup(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeev( jobvl, jobvr, n, A, lda, wr, wi, VL, ldvl, VR, ldvr, work,  &
+        lwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: wr(*)
+    real             :: wi(*)
+    real             :: VL(*)
+    integer          :: ldvl
+    real             :: VR(*)
+    integer          :: ldvr
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeev_m( jobvl, jobvr, n, A, lda, wr, wi, VL, ldvl, VR, ldvr, work,  &
+        lwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: wr(*)
+    real             :: wi(*)
+    real             :: VL(*)
+    integer          :: ldvl
+    real             :: VR(*)
+    integer          :: ldvr
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgegqr_gpu( ikind, m, n, dA, ldda, dwork, work, info )
+    integer          :: ikind
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dwork
+    real             :: work(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgehrd( n, ilo, ihi, A, lda, tau, work, lwork, dT, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_sgehrd_m( n, ilo, ihi, A, lda, tau, work, lwork, T, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    real             :: T(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgehrd2( n, ilo, ihi, A, lda, tau, work, lwork, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgelqf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgelqf_gpu( m, n, dA, ldda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgels( trans, m, n, nrhs, A, lda, B, ldb, hwork, lwork, info )
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: A
+    integer          :: lda
+    magma_devptr_t   :: B
+    integer          :: ldb
+    real             :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sggrqf( m, p, n, A, lda, taua, B, ldb, taub, work, lwork, info )
+    integer          :: m
+    integer          :: p
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: taua(*)
+    real             :: B(*)
+    integer          :: ldb
+    real             :: taub(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgglse( m, n, p, A, lda, B, ldb, c, d, x, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    integer          :: p
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: c(*)
+    real             :: d(*)
+    real             :: x(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgels_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    real             :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgels3_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    real             :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqlf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqp3( m, n, A, lda, jpvt, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: jpvt(*)
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqp3_gpu( m, n, dA, ldda, jpvt, tau, dwork, lwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: jpvt(*)
+    real             :: tau(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqr2x_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqr2x2_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqr2x3_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqr2x4_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, queue, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrf_gpu( m, n, dA, ldda, tau, dT, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrf_m( ngpu, m, n, A, lda, tau, work, lwork, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrf_ooc( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrf2_gpu( m, n, dA, ldda, tau, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrf3_gpu( m, n, dA, ldda, tau, dT, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrs_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork, info  &
+        )
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    real             :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgeqrs3_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork,  &
+        info )
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    real             :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgerbt_gpu( gen, n, nrhs, dA, ldda, dB, lddb, U, V, info )
+    character        :: gen
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    real             :: U(*)
+    real             :: V(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgerfs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, dX, lddx, dworkd,  &
+        dAF, iter, info )
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    magma_devptr_t   :: dX
+    integer          :: lddx
+    magma_devptr_t   :: dworkd
+    magma_devptr_t   :: dAF
+    integer          :: iter
+    integer          :: info
+end
+
+subroutine magmaf_sgesdd( jobz, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork, iwork,  &
+        info )
+    character        :: jobz
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: s(*)
+    real             :: U(*)
+    integer          :: ldu
+    real             :: VT(*)
+    integer          :: ldvt
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgesv( n, nrhs, A, lda, ipiv, B, ldb, info )
+    integer          :: n
+    integer          :: nrhs
+    real             :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    real             :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_sgesv_gpu( n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_sgesv_nopiv_gpu( n, nrhs, dA, ldda, dB, lddb, info )
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_sgesv_rbt( ref, n, nrhs, A, lda, B, ldb, info )
+    character        :: ref
+    integer          :: n
+    integer          :: nrhs
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_sgesvd( jobu, jobvt, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork,  &
+        info )
+    character        :: jobu
+    character        :: jobvt
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: s(*)
+    real             :: U(*)
+    integer          :: ldu
+    real             :: VT(*)
+    integer          :: ldvt
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgetf2_gpu( m, n, dA, ldda, ipiv, queue, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_sgetf2_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_sgetrf( m, n, A, lda, ipiv, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgetrf_gpu( m, n, dA, ldda, ipiv, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgetrf_m( ngpu, m, n, A, lda, ipiv, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_sgetrf_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_sgetrf_nopiv_gpu( m, n, dA, ldda, info )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_sgetri_gpu( n, dA, ldda, ipiv, dwork, lwork, info )
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sgetrs_gpu( trans, n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_sgetrs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_ssyevd( jobz, uplo, n, A, lda, w, work, lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevd_gpu( jobz, uplo, n, dA, ldda, w, wA, ldwa, work, lwork, iwork,  &
+        liwork, info )
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: w(*)
+    real             :: wA(*)
+    integer          :: ldwa
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevd_m( ngpu, jobz, uplo, n, A, lda, w, work, lwork, iwork, liwork,  &
+        info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevdx( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w, work,  &
+        lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevdx_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, mout, w,  &
+        wA, ldwa, work, lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: wA(*)
+    integer          :: ldwa
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevdx_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevdx_2stage( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssyevdx_2stage_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu,  &
+        mout, w, work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssygst( itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_ssygst_gpu( itype, uplo, n, dA, ldda, dB, lddb, info )
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_ssygst_m( ngpu, itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_ssygvd( itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork, iwork,  &
+        liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssygvd_m( ngpu, itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssygvdx( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        mout, w, work, lwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssygvdx_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssygvdx_2stage( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssygvdx_2stage_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb,  &
+        vl, vu, il, iu, mout, w, work, lwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    real             :: w(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ssysv( uplo, n, nrhs, A, lda, ipiv, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    real             :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    real             :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_ssysv_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_ssytrd( uplo, n, A, lda, d, e, tau, work, lwork, info )
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: d(*)
+    real             :: e(*)
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_ssytrd_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: d(*)
+    real             :: e(*)
+    real             :: tau(*)
+    real             :: wA(*)
+    integer          :: ldwa
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_ssytrd2_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork,  &
+        dwork, ldwork, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: d(*)
+    real             :: e(*)
+    real             :: tau(*)
+    real             :: wA(*)
+    integer          :: ldwa
+    real             :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    integer          :: info
+end
+
+integer function magmaf_ssytrd_sb2st( uplo, n, nb, Vblksiz, A, lda, d, e, V, ldv, TAU,  &
+        compT, T, ldt )
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    integer          :: Vblksiz
+    real             :: A(*)
+    integer          :: lda
+    real             :: d(*)
+    real             :: e(*)
+    real             :: V(*)
+    integer          :: ldv
+    real             :: TAU(*)
+    integer          :: compT
+    real             :: T(*)
+    integer          :: ldt
+end
+
+subroutine magmaf_ssytrd_sy2sb( uplo, n, nb, A, lda, tau, work, lwork, dT, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_ssytrf( uplo, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_ssytrf_aasen( uplo, cpu_panel, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: cpu_panel
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_ssytrf_nopiv( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_ssytrf_nopiv_cpu( uplo, n, ib, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: ib
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_ssytrf_nopiv_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_ssytrs_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_slaln2( trans, na, nw, smin, ca, A, lda, d1, d2, B, ldb, wr, wi, X,  &
+        ldx, scale, xnorm, info )
+    integer          :: trans
+    integer          :: na
+    integer          :: nw
+    real             :: smin
+    real             :: ca
+    real             :: A(*)
+    integer          :: lda
+    real             :: d1
+    real             :: d2
+    real             :: B(*)
+    integer          :: ldb
+    real             :: wr
+    real             :: wi
+    real             :: X(*)
+    integer          :: ldx
+    real             :: scale(*)
+    real             :: xnorm(*)
+    integer          :: info
+end
+
+subroutine magmaf_slaqtrsd( trans, n, T, ldt, x, ldx, cnorm, info )
+    character        :: trans
+    integer          :: n
+    real             :: T(*)
+    integer          :: ldt
+    real             :: x(*)
+    integer          :: ldx
+    real             :: cnorm(*)
+    integer          :: info
+end
+
+integer function magmaf_slarf_gpu( m, n, dv, dtau, dC, lddc, queue )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dv
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: queue
+end
+
+integer function magmaf_slarfb2_gpu( m, n, k, dV, lddv, dT, lddt, dC, lddc, dwork,  &
+        ldwork, queue )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dV
+    integer          :: lddv
+    magma_devptr_t   :: dT
+    integer          :: lddt
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_slauum( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_slauum_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_sposv( uplo, n, nrhs, A, lda, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_sposv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_spotf2_gpu( uplo, n, dA, ldda, queue, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_spotrf( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_spotrf_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_spotrf_m( ngpu, uplo, n, A, lda, info )
+    integer          :: ngpu
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_spotri( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_spotri_gpu( uplo, n, dA, ldda, info )
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_spotrs_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_sstedx( range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork, iwork,  &
+        liwork, dwork, info )
+    character        :: range
+    integer          :: n
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: d(*)
+    real             :: e(*)
+    real             :: Z(*)
+    integer          :: ldz
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_sstedx_m( ngpu, range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    character        :: range
+    integer          :: n
+    real             :: vl
+    real             :: vu
+    integer          :: il
+    integer          :: iu
+    real             :: d(*)
+    real             :: e(*)
+    real             :: Z(*)
+    integer          :: ldz
+    real             :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_strevc3( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    real             :: T(*)
+    integer          :: ldt
+    real             :: VL(*)
+    integer          :: ldvl
+    real             :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_strevc3_mt( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    real             :: T(*)
+    integer          :: ldt
+    real             :: VL(*)
+    integer          :: ldvl
+    real             :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+integer function magmaf_strsm_m( ngpu, side, uplo, transa, diag, m, n, alpha, A, lda, B,  &
+        ldb )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: transa
+    character        :: diag
+    integer          :: m
+    integer          :: n
+    real             :: alpha
+    real             :: A(*)
+    integer          :: lda
+    real             :: B(*)
+    integer          :: ldb
+end
+
+subroutine magmaf_strtri( uplo, diag, n, A, lda, info )
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_strtri_gpu( uplo, diag, n, dA, ldda, info )
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_sorgbr( vect, m, n, k, A, lda, tau, work, lwork, info )
+    character        :: vect
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sorghr( n, ilo, ihi, A, lda, tau, dT, nb, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sorghr_m( n, ilo, ihi, A, lda, tau, T, nb, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sorglq( m, n, k, A, lda, tau, dT, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sorgqr( m, n, k, A, lda, tau, dT, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sorgqr_gpu( m, n, k, dA, ldda, tau, dT, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sorgqr_m( m, n, k, A, lda, tau, T, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sorgqr2( m, n, k, A, lda, tau, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_sormbr( vect, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    character        :: vect
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormlq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormrq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormql( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormql2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    real             :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_sormqr( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormqr_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, hwork,  &
+        lwork, dT, nb, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    real             :: hwork(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_sormqr2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    real             :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_sormqr_m( ngpu, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    integer          :: ngpu
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormtr( side, uplo, trans, m, n, A, lda, tau, C, ldc, work, lwork, info  &
+        )
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_sormtr_gpu( side, uplo, trans, m, n, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    real             :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    real             :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_sormtr_m( ngpu, side, uplo, trans, m, n, A, lda, tau, C, ldc, work,  &
+        lwork, info )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    real             :: tau(*)
+    real             :: C(*)
+    integer          :: ldc
+    real             :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+integer function magmaf_s_isnan( x )
+    real             :: x
+end
+
+integer function magmaf_s_isinf( x )
+    real             :: x
+end
+
+integer function magmaf_s_isnan_inf( x )
+    real             :: x
+end
+
+real function magmaf_smake_lwork( lwork )
+    integer          :: lwork
+end
+
+integer function magmaf_snan_inf( uplo, m, n, A, lda, cnt_nan, cnt_inf )
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+end
+
+integer function magmaf_snan_inf_gpu( uplo, m, n, dA, ldda, cnt_nan, cnt_inf, queue )
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_sprint( m, n, A, lda )
+    integer          :: m
+    integer          :: n
+    real             :: A(*)
+    integer          :: lda
+end
+
+subroutine magmaf_sprint_gpu( m, n, dA, ldda, queue )
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_spanel_to_q( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    real             :: A(*)
+    integer          :: lda
+    real             :: work(*)
+end
+
+subroutine magmaf_sq_to_panel( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    real             :: A(*)
+    integer          :: lda
+    real             :: work(*)
+end
+
+end interface
+
+end module magma_sfortran
diff --git a/lib/magma_fmodules/magma_zfortran.F b/lib/magma_fmodules/magma_zfortran.F
new file mode 100644
index 0000000000..c5ef5cbf41
--- /dev/null
+++ b/lib/magma_fmodules/magma_zfortran.F
@@ -0,0 +1,2086 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!  This file is AUTOMATICALLY GENERATED by:
+!!  tools/fortran_wrappers.pl include/magma_z.i
+!!  Do not edit.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+module magma_zfortran
+
+use magma_param
+use iso_fortran_env, ONLY: int64
+
+#define magma_devptr_t integer(int64)
+
+implicit none
+
+!---- Fortran interfaces to MAGMA subroutines ----
+interface
+
+integer function magmaf_get_zpotrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zgetrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zgetri_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zhetrf_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zhetrf_nopiv_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zhetrf_aasen_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zgeqp3_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zgeqrf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zgeqlf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zgelqf_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zgehrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zhetrd_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zhegst_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zhegst_m_nb( n )
+    integer          :: n
+end
+
+integer function magmaf_get_zgebrd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zgesvd_nb( m, n )
+    integer          :: m
+    integer          :: n
+end
+
+integer function magmaf_get_zbulge_nb( n, nbthreads )
+    integer          :: n
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_zbulge_vblksiz( n, nb, nbthreads )
+    integer          :: n
+    integer          :: nb
+    integer          :: nbthreads
+end
+
+integer function magmaf_get_zbulge_gcperf(  )
+end
+
+subroutine magmaf_zgebrd( m, n, A, lda, d, e, tauq, taup, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: tauq(*)
+    complex*16       :: taup(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeev( jobvl, jobvr, n, A, lda, w, VL, ldvl, VR, ldvr, work, lwork,  &
+        rwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: w(*)
+    complex*16       :: VL(*)
+    integer          :: ldvl
+    complex*16       :: VR(*)
+    integer          :: ldvr
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgeev_m( jobvl, jobvr, n, A, lda, w, VL, ldvl, VR, ldvr, work, lwork,  &
+        rwork, info )
+    character        :: jobvl
+    character        :: jobvr
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: w(*)
+    complex*16       :: VL(*)
+    integer          :: ldvl
+    complex*16       :: VR(*)
+    integer          :: ldvr
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgegqr_gpu( ikind, m, n, dA, ldda, dwork, work, info )
+    import int64
+    integer          :: ikind
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dwork
+    complex*16       :: work(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgehrd( n, ilo, ihi, A, lda, tau, work, lwork, dT, info )
+    import int64
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_zgehrd_m( n, ilo, ihi, A, lda, tau, work, lwork, T, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    complex*16       :: T(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgehrd2( n, ilo, ihi, A, lda, tau, work, lwork, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgelqf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgelqf_gpu( m, n, dA, ldda, tau, work, lwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgels( trans, m, n, nrhs, A, lda, B, ldb, hwork, lwork, info )
+    import int64
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: A
+    integer          :: lda
+    magma_devptr_t   :: B
+    integer          :: ldb
+    complex*16       :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zggrqf( m, p, n, A, lda, taua, B, ldb, taub, work, lwork, info )
+    integer          :: m
+    integer          :: p
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: taua(*)
+    complex*16       :: B(*)
+    integer          :: ldb
+    complex*16       :: taub(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgglse( m, n, p, A, lda, B, ldb, c, d, x, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    integer          :: p
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    complex*16       :: c(*)
+    complex*16       :: d(*)
+    complex*16       :: x(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgels_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    import int64
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex*16       :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgels3_gpu( trans, m, n, nrhs, dA, ldda, dB, lddb, hwork, lwork, info )
+    import int64
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex*16       :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqlf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqp3( m, n, A, lda, jpvt, tau, work, lwork, rwork, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: jpvt(*)
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgeqp3_gpu( m, n, dA, ldda, jpvt, tau, dwork, lwork, rwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: jpvt(*)
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgeqr2x_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqr2x2_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqr2x3_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqr2x4_gpu( m, n, dA, ldda, dtau, dT, ddA, dwork, queue, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: ddA
+    magma_devptr_t   :: dwork
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrf( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrf_gpu( m, n, dA, ldda, tau, dT, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrf_m( ngpu, m, n, A, lda, tau, work, lwork, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrf_ooc( m, n, A, lda, tau, work, lwork, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrf2_gpu( m, n, dA, ldda, tau, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrf3_gpu( m, n, dA, ldda, tau, dT, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrs_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork, info  &
+        )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex*16       :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgeqrs3_gpu( m, n, nrhs, dA, ldda, tau, dT, dB, lddb, hwork, lwork,  &
+        info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex*16       :: hwork(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgerbt_gpu( gen, n, nrhs, dA, ldda, dB, lddb, U, V, info )
+    import int64
+    character        :: gen
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    complex*16       :: U(*)
+    complex*16       :: V(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgerfs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, dX, lddx, dworkd,  &
+        dAF, iter, info )
+    import int64
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    magma_devptr_t   :: dX
+    integer          :: lddx
+    magma_devptr_t   :: dworkd
+    magma_devptr_t   :: dAF
+    integer          :: iter
+    integer          :: info
+end
+
+subroutine magmaf_zgesdd( jobz, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork, rwork,  &
+        iwork, info )
+    character        :: jobz
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: s(*)
+    complex*16       :: U(*)
+    integer          :: ldu
+    complex*16       :: VT(*)
+    integer          :: ldvt
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgesv( n, nrhs, A, lda, ipiv, B, ldb, info )
+    integer          :: n
+    integer          :: nrhs
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    complex*16       :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_zgesv_gpu( n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    import int64
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zgesv_nopiv_gpu( n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zgesv_rbt( ref, n, nrhs, A, lda, B, ldb, info )
+    character        :: ref
+    integer          :: n
+    integer          :: nrhs
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_zgesvd( jobu, jobvt, m, n, A, lda, s, U, ldu, VT, ldvt, work, lwork,  &
+        rwork, info )
+    character        :: jobu
+    character        :: jobvt
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: s(*)
+    complex*16       :: U(*)
+    integer          :: ldu
+    complex*16       :: VT(*)
+    integer          :: ldvt
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgetf2_gpu( m, n, dA, ldda, ipiv, queue, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_zgetf2_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zgetrf( m, n, A, lda, ipiv, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgetrf_gpu( m, n, dA, ldda, ipiv, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgetrf_m( ngpu, m, n, A, lda, ipiv, info )
+    integer          :: ngpu
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_zgetrf_nopiv( m, n, A, lda, info )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zgetrf_nopiv_gpu( m, n, dA, ldda, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zgetri_gpu( n, dA, ldda, ipiv, dwork, lwork, info )
+    import int64
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dwork
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zgetrs_gpu( trans, n, nrhs, dA, ldda, ipiv, dB, lddb, info )
+    import int64
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: ipiv(*)
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zgetrs_nopiv_gpu( trans, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: trans
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zheevd( jobz, uplo, n, A, lda, w, work, lwork, rwork, lrwork, iwork,  &
+        liwork, info )
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevd_gpu( jobz, uplo, n, dA, ldda, w, wA, ldwa, work, lwork, rwork,  &
+        lrwork, iwork, liwork, info )
+    import int64
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: w(*)
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevd_m( ngpu, jobz, uplo, n, A, lda, w, work, lwork, rwork, lrwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevdx( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w, work,  &
+        lwork, rwork, lrwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevdx_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, mout, w,  &
+        wA, ldwa, work, lwork, rwork, lrwork, iwork, liwork, info )
+    import int64
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevdx_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevdx_2stage( jobz, range, uplo, n, A, lda, vl, vu, il, iu, mout, w,  &
+        work, lwork, rwork, lrwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevdx_2stage_m( ngpu, jobz, range, uplo, n, A, lda, vl, vu, il, iu,  &
+        mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevr( jobz, range, uplo, n, A, lda, vl, vu, il, iu, abstol, mout, w,  &
+        Z, ldz, isuppz, work, lwork, rwork, lrwork, iwork, liwork, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: abstol
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: Z(*)
+    integer          :: ldz
+    integer          :: isuppz(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevr_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, abstol,  &
+        mout, w, dZ, lddz, isuppz, wA, ldwa, wZ, ldwz, work, lwork, rwork, lrwork, iwork,  &
+        liwork, info )
+    import int64
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: abstol
+    integer          :: mout(*)
+    double precision :: w(*)
+    magma_devptr_t   :: dZ
+    integer          :: lddz
+    integer          :: isuppz(*)
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    complex*16       :: wZ(*)
+    integer          :: ldwz
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zheevx( jobz, range, uplo, n, A, lda, vl, vu, il, iu, abstol, mout, w,  &
+        Z, ldz, work, lwork, rwork, iwork, ifail, info )
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: abstol
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: Z(*)
+    integer          :: ldz
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: ifail(*)
+    integer          :: info
+end
+
+subroutine magmaf_zheevx_gpu( jobz, range, uplo, n, dA, ldda, vl, vu, il, iu, abstol,  &
+        mout, w, dZ, lddz, wA, ldwa, wZ, ldwz, work, lwork, rwork, iwork, ifail, info )
+    import int64
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: abstol
+    integer          :: mout(*)
+    double precision :: w(*)
+    magma_devptr_t   :: dZ
+    integer          :: lddz
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    complex*16       :: wZ(*)
+    integer          :: ldwz
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: ifail(*)
+    integer          :: info
+end
+
+subroutine magmaf_zhegst( itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_zhegst_gpu( itype, uplo, n, dA, ldda, dB, lddb, info )
+    import int64
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zhegst_m( ngpu, itype, uplo, n, A, lda, B, ldb, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_zhegvd( itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork, rwork,  &
+        lrwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvd_m( ngpu, itype, jobz, uplo, n, A, lda, B, ldb, w, work, lwork,  &
+        rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvdx( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvdx_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvdx_2stage( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu,  &
+        il, iu, mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvdx_2stage_m( ngpu, itype, jobz, range, uplo, n, A, lda, B, ldb,  &
+        vl, vu, il, iu, mout, w, work, lwork, rwork, lrwork, iwork, liwork, info )
+    integer          :: ngpu
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvr( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        abstol, mout, w, Z, ldz, isuppz, work, lwork, rwork, lrwork, iwork, liwork, info  &
+        )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: abstol
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: Z(*)
+    integer          :: ldz
+    integer          :: isuppz(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_zhegvx( itype, jobz, range, uplo, n, A, lda, B, ldb, vl, vu, il, iu,  &
+        abstol, mout, w, Z, ldz, work, lwork, rwork, iwork, ifail, info )
+    integer          :: itype
+    character        :: jobz
+    character        :: range
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: abstol
+    integer          :: mout(*)
+    double precision :: w(*)
+    complex*16       :: Z(*)
+    integer          :: ldz
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: iwork(*)
+    integer          :: ifail(*)
+    integer          :: info
+end
+
+subroutine magmaf_zhesv( uplo, n, nrhs, A, lda, ipiv, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    complex*16       :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_zhesv_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zhetrd( uplo, n, A, lda, d, e, tau, work, lwork, info )
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zhetrd_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: tau(*)
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zhetrd2_gpu( uplo, n, dA, ldda, d, e, tau, wA, ldwa, work, lwork,  &
+        dwork, ldwork, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: tau(*)
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    complex*16       :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    integer          :: info
+end
+
+integer function magmaf_zhetrd_hb2st( uplo, n, nb, Vblksiz, A, lda, d, e, V, ldv, TAU,  &
+        compT, T, ldt )
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    integer          :: Vblksiz
+    complex*16       :: A(*)
+    integer          :: lda
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: V(*)
+    integer          :: ldv
+    complex*16       :: TAU(*)
+    integer          :: compT
+    complex*16       :: T(*)
+    integer          :: ldt
+end
+
+subroutine magmaf_zhetrd_he2hb( uplo, n, nb, A, lda, tau, work, lwork, dT, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nb
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: info
+end
+
+subroutine magmaf_zhetrf( uplo, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_zhetrf_aasen( uplo, cpu_panel, n, A, lda, ipiv, info )
+    character        :: uplo
+    integer          :: cpu_panel
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: ipiv(*)
+    integer          :: info
+end
+
+subroutine magmaf_zhetrf_nopiv( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zhetrf_nopiv_cpu( uplo, n, ib, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: ib
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zhetrf_nopiv_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zhetrs_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+integer function magmaf_zlarf_gpu( m, n, dv, dtau, dC, lddc, queue )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dv
+    magma_devptr_t   :: dtau
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: queue
+end
+
+integer function magmaf_zlarfb2_gpu( m, n, k, dV, lddv, dT, lddt, dC, lddc, dwork,  &
+        ldwork, queue )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dV
+    integer          :: lddv
+    magma_devptr_t   :: dT
+    integer          :: lddt
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    magma_devptr_t   :: dwork
+    integer          :: ldwork
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_zlatrsd( uplo, trans, diag, normin, n, A, lda, lambda, x, scale, cnorm,  &
+        info )
+    character        :: uplo
+    character        :: trans
+    character        :: diag
+    character        :: normin
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: lambda
+    complex*16       :: x(*)
+    double precision :: scale(*)
+    double precision :: cnorm(*)
+    integer          :: info
+end
+
+subroutine magmaf_zlauum( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zlauum_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zposv( uplo, n, nrhs, A, lda, B, ldb, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+    integer          :: info
+end
+
+subroutine magmaf_zposv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zpotf2_gpu( uplo, n, dA, ldda, queue, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+    integer          :: info
+end
+
+subroutine magmaf_zpotrf( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zpotrf_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zpotrf_m( ngpu, uplo, n, A, lda, info )
+    integer          :: ngpu
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zpotri( uplo, n, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zpotri_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zpotrs_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zsysv_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zsytrf_nopiv_cpu( uplo, n, ib, A, lda, info )
+    character        :: uplo
+    integer          :: n
+    integer          :: ib
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_zsytrf_nopiv_gpu( uplo, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zsytrs_nopiv_gpu( uplo, n, nrhs, dA, ldda, dB, lddb, info )
+    import int64
+    character        :: uplo
+    integer          :: n
+    integer          :: nrhs
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: dB
+    integer          :: lddb
+    integer          :: info
+end
+
+subroutine magmaf_zstedx( range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork, iwork,  &
+        liwork, dwork, info )
+    import int64
+    character        :: range
+    integer          :: n
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: Z(*)
+    integer          :: ldz
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    magma_devptr_t   :: dwork
+    integer          :: info
+end
+
+subroutine magmaf_zstedx_m( ngpu, range, n, vl, vu, il, iu, d, e, Z, ldz, rwork, lrwork,  &
+        iwork, liwork, info )
+    integer          :: ngpu
+    character        :: range
+    integer          :: n
+    double precision :: vl
+    double precision :: vu
+    integer          :: il
+    integer          :: iu
+    double precision :: d(*)
+    double precision :: e(*)
+    complex*16       :: Z(*)
+    integer          :: ldz
+    double precision :: rwork(*)
+    integer          :: lrwork
+    integer          :: iwork(*)
+    integer          :: liwork
+    integer          :: info
+end
+
+subroutine magmaf_ztrevc3( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, rwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    complex*16       :: T(*)
+    integer          :: ldt
+    complex*16       :: VL(*)
+    integer          :: ldvl
+    complex*16       :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+subroutine magmaf_ztrevc3_mt( side, howmany, select, n, T, ldt, VL, ldvl, VR, ldvr, mm,  &
+        mout, work, lwork, rwork, info )
+    character        :: side
+    character        :: howmany
+    integer          :: select(*)
+    integer          :: n
+    complex*16       :: T(*)
+    integer          :: ldt
+    complex*16       :: VL(*)
+    integer          :: ldvl
+    complex*16       :: VR(*)
+    integer          :: ldvr
+    integer          :: mm
+    integer          :: mout(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    double precision :: rwork(*)
+    integer          :: info
+end
+
+integer function magmaf_ztrsm_m( ngpu, side, uplo, transa, diag, m, n, alpha, A, lda, B,  &
+        ldb )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: transa
+    character        :: diag
+    integer          :: m
+    integer          :: n
+    complex*16       :: alpha
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: B(*)
+    integer          :: ldb
+end
+
+subroutine magmaf_ztrtri( uplo, diag, n, A, lda, info )
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: info
+end
+
+subroutine magmaf_ztrtri_gpu( uplo, diag, n, dA, ldda, info )
+    import int64
+    character        :: uplo
+    character        :: diag
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: info
+end
+
+subroutine magmaf_zungbr( vect, m, n, k, A, lda, tau, work, lwork, info )
+    character        :: vect
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunghr( n, ilo, ihi, A, lda, tau, dT, nb, info )
+    import int64
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zunghr_m( n, ilo, ihi, A, lda, tau, T, nb, info )
+    integer          :: n
+    integer          :: ilo
+    integer          :: ihi
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zunglq( m, n, k, A, lda, tau, dT, nb, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zungqr( m, n, k, A, lda, tau, dT, nb, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zungqr_gpu( m, n, k, dA, ldda, tau, dT, nb, info )
+    import int64
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zungqr_m( m, n, k, A, lda, tau, T, nb, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: T(*)
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zungqr2( m, n, k, A, lda, tau, info )
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    integer          :: info
+end
+
+subroutine magmaf_zunmbr( vect, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    character        :: vect
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmlq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmrq( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmql( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmql2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    import int64
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_zunmqr( side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork, info )
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmqr_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, hwork,  &
+        lwork, dT, nb, info )
+    import int64
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex*16       :: hwork(*)
+    integer          :: lwork
+    magma_devptr_t   :: dT
+    integer          :: nb
+    integer          :: info
+end
+
+subroutine magmaf_zunmqr2_gpu( side, trans, m, n, k, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    import int64
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_zunmqr_m( ngpu, side, trans, m, n, k, A, lda, tau, C, ldc, work, lwork,  &
+        info )
+    integer          :: ngpu
+    character        :: side
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    integer          :: k
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmtr( side, uplo, trans, m, n, A, lda, tau, C, ldc, work, lwork, info  &
+        )
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+subroutine magmaf_zunmtr_gpu( side, uplo, trans, m, n, dA, ldda, tau, dC, lddc, wA, ldwa,  &
+        info )
+    import int64
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    complex*16       :: tau(*)
+    magma_devptr_t   :: dC
+    integer          :: lddc
+    complex*16       :: wA(*)
+    integer          :: ldwa
+    integer          :: info
+end
+
+subroutine magmaf_zunmtr_m( ngpu, side, uplo, trans, m, n, A, lda, tau, C, ldc, work,  &
+        lwork, info )
+    integer          :: ngpu
+    character        :: side
+    character        :: uplo
+    character        :: trans
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: tau(*)
+    complex*16       :: C(*)
+    integer          :: ldc
+    complex*16       :: work(*)
+    integer          :: lwork
+    integer          :: info
+end
+
+integer function magmaf_z_isnan( x )
+    complex*16       :: x
+end
+
+integer function magmaf_z_isinf( x )
+    complex*16       :: x
+end
+
+integer function magmaf_z_isnan_inf( x )
+    complex*16       :: x
+end
+
+integer function magmaf_znan_inf( uplo, m, n, A, lda, cnt_nan, cnt_inf )
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+end
+
+integer function magmaf_znan_inf_gpu( uplo, m, n, dA, ldda, cnt_nan, cnt_inf, queue )
+    import int64
+    character        :: uplo
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    integer          :: cnt_nan(*)
+    integer          :: cnt_inf(*)
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_zprint( m, n, A, lda )
+    integer          :: m
+    integer          :: n
+    complex*16       :: A(*)
+    integer          :: lda
+end
+
+subroutine magmaf_zprint_gpu( m, n, dA, ldda, queue )
+    import int64
+    integer          :: m
+    integer          :: n
+    magma_devptr_t   :: dA
+    integer          :: ldda
+    magma_devptr_t   :: queue
+end
+
+subroutine magmaf_zpanel_to_q( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: work(*)
+end
+
+subroutine magmaf_zq_to_panel( uplo, ib, A, lda, work )
+    character        :: uplo
+    integer          :: ib
+    complex*16       :: A(*)
+    integer          :: lda
+    complex*16       :: work(*)
+end
+
+end interface
+
+end module magma_zfortran
diff --git a/sbin/compilation/libraries.sh b/sbin/compilation/libraries.sh
index 4d299886e6..e87be8c105 100755
--- a/sbin/compilation/libraries.sh
+++ b/sbin/compilation/libraries.sh
@@ -17,7 +17,7 @@ do
 done
 #
 llocal="-lqe_pseudo -lmath77 -lslatec -llocal"
-lPLA="\$(lscalapack) \$(lblacs) \$(llapack) \$(lblas)"
+lPLA="\$(lscalapack) \$(lblacs) \$(lmagma) \$(llapack) \$(lblas)"
 lSL="\$(lslepc) \$(lpetsc)"
 lIO="\$(liotk) \$(lnetcdff) \$(lnetcdf) \$(lhdf5)"
 lextlibs="\$(llibxc) \$(lfft) \$(lfutile) \$(lyaml)  \$(ldevxlib) \$(llapack) \$(lblas) \$(lcudalib)"
diff --git a/src/dipoles/Berry_polarization_EQ.F b/src/dipoles/Berry_polarization_EQ.F
index d2149ee9fe..cd1ad3fe82 100644
--- a/src/dipoles/Berry_polarization_EQ.F
+++ b/src/dipoles/Berry_polarization_EQ.F
@@ -76,7 +76,7 @@ subroutine Berry_polarization_EQ(P_Berry_Red,All_S_det,en,Xk,k_map)
      enddo
    enddo
    !
-   P_Berry_RED(id_in)=-P_Berry_RED(id_in)/real(Nperpend,SP)
+   P_Berry_RED(id_in)=P_Berry_RED(id_in)/real(Nperpend,SP)
    !
  enddo
  !
diff --git a/src/dipoles/DIPOLE_covariant.F b/src/dipoles/DIPOLE_covariant.F
index b8d6de6378..fe925eb748 100644
--- a/src/dipoles/DIPOLE_covariant.F
+++ b/src/dipoles/DIPOLE_covariant.F
@@ -159,7 +159,7 @@ subroutine DIPOLE_covariant(Xen,Xk,Dip,direction_is_todo)
        do ic=max(iv,Dip%ib_lim(2)),Dip%ib(2)
          if(.not.PAR_IND_CON_BANDS_DIP%element_1D(ic)) cycle
          do idir=1,3
-           DIP_iR(idir,ic,iv,ik_mem,i_sp_pol)=(DIP_tmp(idir,ic,iv)+conjg(DIP_tmp(idir,iv,ic)))/cI
+           DIP_iR(idir,ic,iv,ik_mem,i_sp_pol)=(DIP_tmp(idir,ic,iv)+conjg(DIP_tmp(idir,iv,ic)))*cI
          enddo
        enddo
      enddo
diff --git a/src/hamiltonian/Build_W_operator.F b/src/hamiltonian/Build_W_operator.F
index a5857d6876..dd62557669 100644
--- a/src/hamiltonian/Build_W_operator.F
+++ b/src/hamiltonian/Build_W_operator.F
@@ -136,7 +136,7 @@ subroutine Build_W_operator(en,Xk,A_input,ik,i_sp,V_bands,H_nl_sc)
  !$omp parallel do default(shared), private(i1,id)
  do i1=H_ref_bands(1),H_ref_bands(2)
    do id=1,3
-     H_nl_sc(i1,H_ref_bands(1):H_ref_bands(2))=H_nl_sc(i1,H_ref_bands(1):H_ref_bands(2))-         &
+     H_nl_sc(i1,H_ref_bands(1):H_ref_bands(2))=H_nl_sc(i1,H_ref_bands(1):H_ref_bands(2))+         &
      &                                               E_vec_pot(id)*Wk(id,i1,H_ref_bands(1):H_ref_bands(2))
    enddo
  enddo
diff --git a/src/linear_algebra/LINEAR_ALGEBRA_driver.F b/src/linear_algebra/LINEAR_ALGEBRA_driver.F
index 7f5153e3bd..f78870ff16 100644
--- a/src/linear_algebra/LINEAR_ALGEBRA_driver.F
+++ b/src/linear_algebra/LINEAR_ALGEBRA_driver.F
@@ -79,7 +79,7 @@ subroutine LINEAR_ALGEBRA_driver(idriver,lib_in,&
  endif
 
  !
- ! Decide which to use among LK or SLK
+ ! Decide which LA lib to use
  !
  lib_in_use=USE_LK
 #if defined _SCALAPACK 
diff --git a/src/linear_algebra/SERIAL_HERMITIAN_diagonalization.F b/src/linear_algebra/SERIAL_HERMITIAN_diagonalization.F
index b33bccf04b..6108a72c96 100644
--- a/src/linear_algebra/SERIAL_HERMITIAN_diagonalization.F
+++ b/src/linear_algebra/SERIAL_HERMITIAN_diagonalization.F
@@ -7,11 +7,19 @@
 !
 subroutine SERIAL_HERMITIAN_diagonalization(n,M,E)
  !
- use pars,           ONLY:SP
- use drivers,        ONLY:l_nl_optics,l_real_time
- use linear_algebra, ONLY:LINEAR_ALGEBRA_error,&
-&                         LINEAR_ALGEBRA_WS_reset,LALGEBRA_WS
- use timing_m,       ONLY:timing
+ use pars,           ONLY: SP
+ use drivers,        ONLY: l_nl_optics,l_real_time
+ use linear_algebra, ONLY: LINEAR_ALGEBRA_error,LINEAR_ALGEBRA_WS_reset,LALGEBRA_WS,&
+&                          magma_init_done,magma_setup,la_xheev
+#ifdef _MAGMA
+ use magma,          ONLY: magmaf_cheevd_m, magmaf_zheevd_m
+#endif
+ use timing_m,       ONLY: timing
+ use com,            ONLY: msg
+#ifdef _OPENMP
+ use omp_lib
+#endif
+ !
 #include<y_memory.h>
  !
  integer     :: n
@@ -19,46 +27,96 @@ subroutine SERIAL_HERMITIAN_diagonalization(n,M,E)
  real(SP)    :: E(n)
  !
  character(64)     :: subname="SERIAL_HERMITIAN_diagonalization"
- integer           :: lwork
+ integer           :: lwork, lrwork, liwork
  type(LALGEBRA_WS) :: WS
  !
- lwork=-1
- allocate(WS%v_cmplx(1))
- !
+ integer     :: nthreads_save
+
+#if defined _DOUBLE
+#  define magmaf_xheevd_m magmaf_zheevd_m
+#else
+#  define magmaf_xheevd_m magmaf_cheevd_m
+#endif
+
  if(.not.(l_nl_optics.or.l_real_time)) then
    call timing('SERIAL_HERMITIAN_diagonalization',OPR='start')
-   YAMBO_ALLOC(WS%v_real,(max(1,3*n-2)))
- else
-   allocate(WS%v_real(max(1,3*n-2)))
  endif
  !
-#if defined _DOUBLE
- call ZHEEV('V','U',n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,WS%i_fail)
+ ! Thread safety
+#if defined _OPENMP
+ nthreads_save=omp_get_max_threads()
+ call omp_set_num_threads(1)
+#endif
+
+ !
+ ! Workspace
+ !
+ lwork=-1
+ lrwork=-1
+ liwork=-1
+ allocate(WS%v_cmplx(1))
+ allocate(WS%v_real(1))
+ allocate(WS%v_int(1))
+ !
+#if defined _MAGMA
+   !
+   if (.not.magma_init_done) then
+     call msg('sr','Initializing magma library in geev')
+     call magma_setup()
+   endif
+   !   
+   call magmaf_xheevd_m(1,'v','u', n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,&
+&                       lrwork,WS%v_int,liwork,WS%i_fail)
 #else
- call CHEEV('V','U',n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,WS%i_fail)
+   call la_xheev('V','U',n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,WS%i_fail)
 #endif
+ !
+ if(WS%i_fail /=0 ) call LINEAR_ALGEBRA_error(' _XHEEV_ ','WS%v_cmplx size query failed')
+ !
  !
  lwork=nint(real(WS%v_cmplx(1)))
+ lrwork=nint(WS%v_real(1))
+ liwork=WS%v_int(1)
  deallocate(WS%v_cmplx)
+ deallocate(WS%v_real)
+ deallocate(WS%v_int)
  !
  if(.not.(l_nl_optics.or.l_real_time)) then
    YAMBO_ALLOC(WS%v_cmplx,(lwork))
+   YAMBO_ALLOC(WS%v_real,(lrwork))
+   YAMBO_ALLOC(WS%v_int,(liwork))
  else
    allocate(WS%v_cmplx(lwork))
+   allocate(WS%v_real(lrwork))
+   allocate(WS%v_int(liwork))
  endif
+
+ !   
+ ! use magma (if available)
+ !   
+#if defined _MAGMA
+ ! 
+ call magmaf_xheevd_m(1,'v','u',n, M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,&
+&                     lrwork,WS%v_int,liwork,WS%i_fail)
  !
-#if defined _DOUBLE
- call ZHEEV('V','U',n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,WS%i_fail)
- if(WS%i_fail.ne.0) call LINEAR_ALGEBRA_error(subname,'performing ZHEEV')
 #else
- call CHEEV('V','U',n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,WS%i_fail)
- if(WS%i_fail.ne.0) call LINEAR_ALGEBRA_error(subname,'performing CHEEV')
+ !
+ call la_xheev('V','U',n,M,size(M,1),E,WS%v_cmplx,lwork,WS%v_real,WS%i_fail)
+ !
 #endif
+ !
+ if(WS%i_fail /= 0) call LINEAR_ALGEBRA_error(' XHEEV ','failed')
  !
  call LINEAR_ALGEBRA_WS_reset(WS)
+ !
+ ! Thread safety
+#if defined _OPENMP
+ call omp_set_num_threads(nthreads_save)
+#endif
  !
  if(.not.(l_nl_optics.or.l_real_time)) then
    call timing('SERIAL_HERMITIAN_diagonalization',OPR='stop')
  endif
  !
 end subroutine
+
diff --git a/src/linear_algebra/SERIAL_SVD_inversion.F b/src/linear_algebra/SERIAL_SVD_inversion.F
index 1e0ab201fe..fb95c78e95 100644
--- a/src/linear_algebra/SERIAL_SVD_inversion.F
+++ b/src/linear_algebra/SERIAL_SVD_inversion.F
@@ -9,7 +9,7 @@ subroutine SERIAL_SVD_inversion(n,M,SVD_digits)
  !
  use pars,           ONLY:SP,cZERO
  use wrapper,        ONLY:M_by_M
- use linear_algebra, ONLY:LINEAR_ALGEBRA_error,SV_decomposition,&
+ use linear_algebra, ONLY:LINEAR_ALGEBRA_error,la_xgesvd,&
 &                         LINEAR_ALGEBRA_WS_reset,LALGEBRA_WS
  use timing_m,       ONLY:timing
 #include<y_memory.h>
@@ -31,14 +31,17 @@ subroutine SERIAL_SVD_inversion(n,M,SVD_digits)
  YAMBO_ALLOC(WS%m1_cmplx,(n,n))
  allocate(WS%v_cmplx(1))
  !
- call SV_decomposition(n,M,WS%vp_real,WS%m2_cmplx,WS%m1_cmplx,WS%v_cmplx,-1,WS%v_real,WS%i_fail)
+ call la_xgesvd('S','A',n,n,M,n,WS%vp_real,WS%m2_cmplx,n,WS%m1_cmplx,n,&
+&               WS%v_cmplx,-1,WS%v_real,WS%i_fail)
  !
  if(WS%i_fail/=0) call LINEAR_ALGEBRA_error('GESVD (SVD)','WS%v_cmplxspace failed')
  !
  WS%dim=int(real(WS%v_cmplx(1)))
  deallocate(WS%v_cmplx)
  YAMBO_ALLOC(WS%v_cmplx,(WS%dim))
- call SV_decomposition(n,M,WS%vp_real,WS%m2_cmplx,WS%m1_cmplx,WS%v_cmplx,WS%dim,WS%v_real,WS%i_fail)
+ !
+ call la_xgesvd('S','A',n,n,M,n,WS%vp_real,WS%m2_cmplx,n,WS%m1_cmplx,n,&
+&               WS%v_cmplx,WS%dim,WS%v_real,WS%i_fail)
  !
  if(WS%i_fail/=0) call LINEAR_ALGEBRA_error('GESVD (SVD)','failed')
  !
diff --git a/src/linear_algebra/SERIAL_diagonalization.F b/src/linear_algebra/SERIAL_diagonalization.F
index e03eada92f..f3544d0885 100644
--- a/src/linear_algebra/SERIAL_diagonalization.F
+++ b/src/linear_algebra/SERIAL_diagonalization.F
@@ -15,32 +15,95 @@ subroutine SERIAL_diagonalization(n,M,E,V_left,V_right)
  !                V_left(j)**H * M = E(j) * V_left(j)**H
  !  where V_left(j)**H denotes the conjugate transpose of V_left(j).
  !
- use pars,          ONLY:SP
- use linear_algebra,ONLY:LINEAR_ALGEBRA_error,M_eigenvalues,LINEAR_ALGEBRA_WS_reset,LALGEBRA_WS
- use timing_m,      ONLY:timing
+ use pars,            ONLY: SP
+ use linear_algebra,  ONLY: LINEAR_ALGEBRA_error,LINEAR_ALGEBRA_WS_reset,LALGEBRA_WS,&
+&                           magma_init_done,magma_setup,la_xgeev
+#ifdef _MAGMA
+ use magma,           ONLY: magmaf_zgeev_m,magmaf_cgeev_m
+#endif
+ use timing_m,        ONLY: timing
+ use com,             ONLY: msg
+#ifdef _OPENMP
+ use omp_lib
+#endif
+ !
 #include<y_memory.h>
  !
  integer           :: n
  complex(SP)       :: M(n,n),E(n),V_left(n,n),V_right(n,n)
  type(LALGEBRA_WS) :: WS
  !
+ integer :: nthreads_save
+
+#if defined _DOUBLE
+#  define magmaf_xgeev_m magmaf_zgeev_m
+#else
+#  define magmaf_xgeev_m magmaf_cgeev_m
+#endif
+
+ call timing('SERIAL_diagonalization',OPR='start')
+ !
+ ! Thread safety
+#if defined _OPENMP
+ nthreads_save=omp_get_max_threads()
+ call omp_set_num_threads(1)
+#endif
+
+ !
+ ! Workspace
+ !
  allocate(WS%v_cmplx(1))
  YAMBO_ALLOC(WS%v_real,(2*n))
- call M_eigenvalues(n,M,E,V_left,V_right,WS%v_cmplx,-1,WS%v_real,WS%i_fail)
  !
- call timing('SERIAL_diagonalization',OPR='start')
+#if defined _MAGMA
+   !
+   if (.not.magma_init_done) then
+     call msg('sr','Initializing magma library in geev')
+     call magma_setup()
+   endif
+   !   
+   call magmaf_xgeev_m('V','V', n,M,n,E,V_left,n,V_right,n,&
+&                      WS%v_cmplx,-1,WS%v_real,WS%i_fail)
+#else
+   call la_xgeev('V','V',n,M,n,E,V_left,n,V_right,n,WS%v_cmplx,-1,WS%v_real,WS%i_fail)
+#endif
  !
- if(WS%i_fail.ne.0) call LINEAR_ALGEBRA_error('M_eigenvalues (SD)','WS%v_cmplxspace failed')
+ if(WS%i_fail /=0 ) call LINEAR_ALGEBRA_error(' _XGEEV_ ','WS%v_cmplx size query failed')
  !
  WS%dim=int(real(WS%v_cmplx(1)))
  deallocate(WS%v_cmplx)
  YAMBO_ALLOC(WS%v_cmplx,(WS%dim))
- call M_eigenvalues(n,M,E,V_left,V_right,WS%v_cmplx,WS%dim,WS%v_real,WS%i_fail)
+
+ !   
+ ! use magma (if available)
+ !   
+#if defined _MAGMA
+ !   
+ call msg('sr','SERIAL diagonalization with magma')
+ !
+ call magmaf_xgeev_m('V','V', n,M,n,E,V_left,n,V_right,n,&
+&                    WS%v_cmplx,WS%dim,WS%v_real,WS%i_fail)
+ !   
+#else
+ !   
+ ! use lapack (otherwise)
+ !   
+ call msg('sr','SERIAL diagonalization with lapack')
  !
- if(WS%i_fail.ne.0) call LINEAR_ALGEBRA_error('M_eigenvalues (SD)','failed')
+ call la_xgeev('V','V',n,M,n,E,V_left,n,V_right,n,WS%v_cmplx,WS%dim,WS%v_real,WS%i_fail)
+ !   
+#endif
+ !
+ if(WS%i_fail /= 0) call LINEAR_ALGEBRA_error(' _XGEEV_ ','failed')
  !
  call LINEAR_ALGEBRA_WS_reset(WS)
  !
+ ! Thread safety
+#if defined _OPENMP
+ call omp_set_num_threads(nthreads_save)
+#endif
+ !   
+ !
  call timing('SERIAL_diagonalization',OPR='stop')
  !
 end subroutine
diff --git a/src/linear_algebra/SERIAL_inversion.F b/src/linear_algebra/SERIAL_inversion.F
index 79c489e57b..69b6249cee 100644
--- a/src/linear_algebra/SERIAL_inversion.F
+++ b/src/linear_algebra/SERIAL_inversion.F
@@ -9,7 +9,7 @@ subroutine SERIAL_inversion(n,M,det,eval_det)
  !
  use pars,           ONLY: SP,cONE
  use drivers,        ONLY: l_nl_optics,l_real_time
- use linear_algebra, ONLY: LINEAR_ALGEBRA_error,LU_factorization,LU_inversion,&
+ use linear_algebra, ONLY: LINEAR_ALGEBRA_error,la_xgetrf,la_xgetri,&
 &                          LINEAR_ALGEBRA_WS_reset,LALGEBRA_WS
  use timing_m,       ONLY: timing
 #include<y_memory.h>
@@ -29,7 +29,7 @@ subroutine SERIAL_inversion(n,M,det,eval_det)
    allocate(WS%v_int(n))
  endif
  !
- call LU_factorization(n,M,WS%v_int,WS%i_fail)
+ call la_xgetrf(n,n,M,n,WS%v_int,WS%i_fail)
  !
  if(WS%i_fail/=0) call LINEAR_ALGEBRA_error('GETRF (SI)','WS%v_cmplxspace failed')
  !
@@ -49,7 +49,9 @@ subroutine SERIAL_inversion(n,M,det,eval_det)
  else
    allocate(WS%v_cmplx(1))
  endif
- call LU_inversion(n,M,WS%v_int,WS%v_cmplx,-1,WS%i_fail)
+ !
+ call la_xgetri(n,M,n,WS%v_int,WS%v_cmplx,-1,WS%i_fail)
+ !
  WS%dim=int(real(WS%v_cmplx(1)))
  if(.not.(l_nl_optics.or.l_real_time)) then
    YAMBO_FREE(WS%v_cmplx)
@@ -58,7 +60,8 @@ subroutine SERIAL_inversion(n,M,det,eval_det)
    deallocate(WS%v_cmplx)
    allocate(WS%v_cmplx(WS%dim))
  endif
- call LU_inversion(n,M,WS%v_int,WS%v_cmplx,WS%dim,WS%i_fail)
+ !
+ call la_xgetri(n,M,n,WS%v_int,WS%v_cmplx,WS%dim,WS%i_fail)
  !
  if(WS%i_fail/=0) call LINEAR_ALGEBRA_error('GETRI (SI)','failed')
  !
diff --git a/src/modules/.objects b/src/modules/.objects
index 6857541807..e962a2af5e 100644
--- a/src/modules/.objects
+++ b/src/modules/.objects
@@ -44,6 +44,7 @@ objs = mod_pars.o mod_units.o mod_lexical_sort.o mod_stderr.o mod_openmp.o mod_m
        mod_QP.o mod_MPA.o mod_collision_el.o \
        mod_BS.o mod_BS_solvers.o mod_QP_CTL.o mod_TDDFT.o mod_ACFDT.o mod_MAGNONS.o mod_DICHROISM.o mod_PHOTOLUM.o \
        mod_IO.o mod_IO_interfaces.o mod_COLL_interfaces.o $(ELPH_objects) mod_POL_FIT.o  $(RT_objects_pre) \
-       mod_hamiltonian.o $(COMMON_objects) $(SC_objects) $(RT_objects_post) $(RT_objects_iterative) $(MAGNETIC_objects) $(NL_objects) $(ELECTRIC_objects) \
+       mod_hamiltonian.o $(COMMON_objects) $(SC_objects) $(RT_objects_post) $(RT_objects_iterative) $(MAGNETIC_objects) \
+          $(NL_objects) $(ELECTRIC_objects) \
        mod_debug.o mod_interfaces.o mod_interpolate_tools.o mod_interpolate.o SET_logicals.o SET_defaults.o $(DEV_objects)
 #endif
diff --git a/src/modules/mod_linear_algebra.F b/src/modules/mod_linear_algebra.F
index 9e7ca9ecaf..ebebd9ba20 100644
--- a/src/modules/mod_linear_algebra.F
+++ b/src/modules/mod_linear_algebra.F
@@ -7,7 +7,14 @@
 !
 module linear_algebra
  !
- use pars,       ONLY:SP,schlen
+ use iso_c_binding
+ use iso_fortran_env,  ONLY: int64
+ use pars,             ONLY: SP,schlen
+ !
+#ifdef _MAGMA
+ use magma,            ONLY: magmaf_init,magmaf_queue_create,&
+&                            magmaf_cgeev_m,magmaf_zgeev_m,MagmaVec
+#endif
  !
 #include<dev_defs.h>
 #include<y_memory.h>
@@ -22,6 +29,16 @@ module linear_algebra
  integer, parameter :: LIN_SYS=8
  integer, parameter :: MAT_MUL=9
  integer, parameter :: min_cpu_block_size=50
+ !
+ ! magma vars
+ !
+ integer(int64)     :: magma_queue    !! magma_queue_t
+ logical            :: magma_init_done = .false.
+#if defined _MAGMA
+ logical, parameter :: have_magma=.true.
+#else
+ logical, parameter :: have_magma=.false.
+#endif
  !
  ! Common Work Space
  !
@@ -48,17 +65,156 @@ module linear_algebra
    integer    , allocatable DEV_ATTR :: vp_int_d(:)
    !
  end type LALGEBRA_WS
+
+ !
+ !===============
+ ! INTERFACES
+ !===============
+ !
+ ! Eigensolvers
+ !
+ interface la_xgeev
+   subroutine zgeev(jobvl,jobvr,n,A,lda,w,vl,ldvl,vr,ldvr,work,lwork,rwork,info)
+     use iso_fortran_env, ONLY : WP => real64
+     character(1) :: jobvl,jobvr 
+     integer      :: n,lda,ldvl,ldvr,lwork,info
+     complex(WP)  :: w(*), A(lda,*), vl(ldvl,*), vr(ldvr,*), work(*)
+     real(WP)     :: rwork(*)
+   end subroutine
+   subroutine cgeev(jobvl,jobvr,n,A,lda,w,vl,ldvl,vr,ldvr,work,lwork,rwork,info)
+     use iso_fortran_env, ONLY : WP => real32
+     character(1) :: jobvl,jobvr 
+     integer      :: n,lda,ldvl,ldvr,lwork,info
+     complex(WP)  :: w(*), A(lda,*), vl(ldvl,*), vr(ldvr,*), work(*)
+     real(WP)     :: rwork(*)
+   end subroutine
+ end interface
  !
- public :: LU_factorization
- public :: LU_inversion
- public :: SV_decomposition
- public :: M_eigenvalues
+ interface la_xheev
+   subroutine zheev(jobz,uplo,n,A,lda,w,work,lwork,rwork,info)
+     use iso_fortran_env, ONLY : WP => real64
+     character(1) :: jobz,uplo
+     integer      :: n,lda,lwork,info
+     complex(WP)  :: A(lda,*), work(*)
+     real(WP)     :: w(*), rwork(*)
+   end subroutine
+   subroutine cheev(jobz,uplo,n,A,lda,w,work,lwork,rwork,info)
+     use iso_fortran_env, ONLY : WP => real32
+     character(1) :: jobz,uplo
+     integer      :: n,lda,lwork,info
+     complex(WP)  :: A(lda,*), work(*)
+     real(WP)     :: w(*), rwork(*)
+   end subroutine
+ end interface
+ !
+!#ifdef _MAGMA
+! !
+! interface magmaf_xgeev_m
+!   procedure :: magmaf_cgeev_m,magmaf_zgeev_m
+! end interface
+! !
+! interface magmaf_xheevd_m
+!   procedure :: magmaf_cheevd_m,magmaf_zheevd_m
+! end interface
+! !
+!#endif
+ ! 
+ ! Singular Value Decomposition
+ !
+ interface la_xgesvd
+   subroutine zgesvd(jobu,jobvt,m,n,A,lda,s,U,ldu,VT,ldvt,work,lwork,rwork,info)
+     use iso_fortran_env, ONLY : WP => real64
+     character(1) :: jobu,jobvt
+     integer      :: m,n,lda,ldu,ldvt,lwork,info
+     complex(WP)  :: A(lda,*), U(ldu,*), VT(ldvt,*), work(*)
+     real(WP)     :: s(*), rwork(*)
+   end subroutine
+   subroutine cgesvd(jobu,jobvt,m,n,A,lda,s,U,ldu,VT,ldvt,work,lwork,rwork,info)
+     use iso_fortran_env, ONLY : WP => real32
+     character(1) :: jobu,jobvt
+     integer      :: m,n,lda,ldu,ldvt,lwork,info
+     complex(WP)  :: A(lda,*), U(ldu,*), VT(ldvt,*), work(*)
+     real(WP)     :: s(*), rwork(*)
+   end subroutine
+ end interface
+ !
+ ! Lower/Upper Factorization and Inverison
  !
- interface M_eigenvalues
-   module procedure heev,geev
+ interface la_xgetrf
+   subroutine zgetrf(m,n,A,lda,ipiv,info)
+     use iso_fortran_env, ONLY : WP => real64
+     integer      :: m,n,lda,info
+     integer      :: ipiv(*)
+     complex(WP)  :: A(lda,*) 
+   end subroutine
+   subroutine cgetrf(m,n,A,lda,ipiv,info)
+     use iso_fortran_env, ONLY : WP => real32
+     integer      :: m,n,lda,info
+     integer      :: ipiv(*)
+     complex(WP)  :: A(lda,*) 
+   end subroutine
  end interface
  !
+ interface la_xgetri
+   subroutine zgetri(n,A,lda,ipiv,work,lwork,info)
+     use iso_fortran_env, ONLY : WP => real64
+     integer      :: n,lda,info,lwork
+     integer      :: ipiv(*)
+     complex(WP)  :: A(lda,*), work(*)
+   end subroutine
+   subroutine cgetri(n,A,lda,ipiv,work,lwork,info)
+     use iso_fortran_env, ONLY : WP => real32
+     integer      :: n,lda,info,lwork
+     integer      :: ipiv(*)
+     complex(WP)  :: A(lda,*), work(*)
+   end subroutine
+ end interface
+ !
+ interface la_xgetrs
+   subroutine zgetrs(trans,n,nrhs,A,lda,ipiv,B,ldb,info)
+     use iso_fortran_env, ONLY : WP => real64
+     character(1) :: trans
+     integer      :: n,nrhs,lda,ldb,info
+     integer      :: ipiv(*)
+     complex(WP)  :: A(lda,*), B(ldb,*)
+   end subroutine
+   subroutine cgetrs(trans,n,nrhs,A,lda,ipiv,B,ldb,info)
+     use iso_fortran_env, ONLY : WP => real32
+     character(1) :: trans
+     integer      :: n,nrhs,lda,ldb,info
+     integer      :: ipiv(*)
+     complex(WP)  :: A(lda,*), B(ldb,*)
+   end subroutine
+ end interface
+
+
+ !
+ !====================
+ ! PUBLIC STATEMENTS
+ !====================
+ !
+!#ifdef _MAGMA
+! public :: magmaf_xgeev_m,magmaf_xheevd_m
+!#endif
+ public :: la_xgeev, la_xheev
+ public :: la_xgesvd
+ public :: la_xgetrf, la_xgetri, la_xgetrs
+ !
+ !
  contains
+   !
+   !============================
+   ! AUXILIARY FUNCTIONS
+   !============================
+   !
+   subroutine magma_setup()
+#ifdef _MAGMA
+     call magmaf_init()
+     call magmaf_queue_create( 0, magma_queue )
+     magma_init_done=.true.
+#endif
+     return
+   end subroutine
    !
    subroutine LINEAR_ALGEBRA_WS_reset(WS)
      use drivers,   ONLY:l_nl_optics,l_real_time
@@ -83,15 +239,6 @@ subroutine LINEAR_ALGEBRA_WS_reset(WS)
        YAMBO_FREE(WS%vp_int)
        YAMBO_FREE(WS%v_int)
      else
-       if(allocated(WS%v_real))   deallocate(WS%v_real)
-       if(allocated(WS%vp_real))  deallocate(WS%vp_real)
-       if(allocated(WS%v_cmplx))  deallocate(WS%v_cmplx)
-       if(allocated(WS%vp_cmplx)) deallocate(WS%vp_cmplx)
-       if(allocated(WS%m1_cmplx)) deallocate(WS%m1_cmplx)
-       if(allocated(WS%m2_cmplx)) deallocate(WS%m2_cmplx)
-       if(allocated(WS%vp_int))   deallocate(WS%vp_int)
-       if(allocated(WS%v_int))    deallocate(WS%v_int)
-       !
 #ifdef _CUDAF
        if(allocated(WS%v_real_d))   deallocate(WS%v_real_d)
        if(allocated(WS%vp_real_d))  deallocate(WS%vp_real_d)
@@ -108,6 +255,16 @@ subroutine LINEAR_ALGEBRA_WS_reset(WS)
        !
        !call error("[GPU] openacc FREE not implemented in LinAlg_WS_reset")
 #endif
+       !
+       if(allocated(WS%v_real))   deallocate(WS%v_real)
+       if(allocated(WS%vp_real))  deallocate(WS%vp_real)
+       if(allocated(WS%v_cmplx))  deallocate(WS%v_cmplx)
+       if(allocated(WS%vp_cmplx)) deallocate(WS%vp_cmplx)
+       if(allocated(WS%m1_cmplx)) deallocate(WS%m1_cmplx)
+       if(allocated(WS%m2_cmplx)) deallocate(WS%m2_cmplx)
+       if(allocated(WS%vp_int))   deallocate(WS%vp_int)
+       if(allocated(WS%v_int))    deallocate(WS%v_int)
+       !
      endif
      !
    end subroutine
@@ -118,94 +275,5 @@ subroutine LINEAR_ALGEBRA_error(calling_subr,message_)
      call error( trim( STRING_pack('LINEAR ALGEBRA driver [',trim(calling_subr),'] ',trim(message_)) ))
    end subroutine
    !
-   !============================
-   ! SINGLE VALUE DECOMPOSITION
-   !============================
-   !
-   subroutine SV_decomposition(msize, M, SV, U, VH, work, lwork, r_WK, ifail)
-     !
-     integer,    intent(in)   :: msize, lwork
-     integer,    intent(out)  :: ifail
-     !     
-     real(SP),   intent(out)  :: r_WK(*), SV(*)
-     complex(SP),intent(inout):: M(msize,*)
-     complex(SP),intent(out)  :: U(msize,*), VH(msize,*), work(*)
-     !
-#if defined _DOUBLE
-   call ZGESVD('S','A',msize,msize,M,msize,SV,U,msize,VH,msize,work,lwork,r_WK,ifail)
-#else
-   call CGESVD('S','A',msize,msize,M,msize,SV,U,msize,VH,msize,work,lwork,r_WK,ifail)
-#endif
-     !
-   end subroutine SV_decomposition
-   !
-   !=========================================
-   ! LOWER/UPPER FACTORIZATION and INVERISON
-   !=========================================
-   !
-   subroutine LU_factorization(msize,M,ipvt,ifail)
-     !
-     integer,     intent(in)   :: msize
-     integer,     intent(out)  :: ifail, ipvt(*)
-     complex(SP), intent(inout):: M(msize,*)
-     !
-#if defined _DOUBLE
-     call zgetrf(msize,msize,M,msize,ipvt,ifail)
-#else
-     call cgetrf(msize,msize,M,msize,ipvt,ifail)
-#endif
-     !
-   end subroutine LU_factorization
-   !
-   subroutine LU_inversion(msize,M,ipvt,work,lwork,ifail)
-     !
-     integer,     intent(in)   :: msize, lwork, ipvt(*)
-     integer,     intent(out)  :: ifail
-     complex(SP), intent(inout):: M(msize,*)
-     complex(SP), intent(out)  :: work(*)
-     !
-#if defined _DOUBLE
-     call zgetri(msize,M,msize,ipvt,work,lwork,ifail)
-#else
-     call cgetri(msize,M,msize,ipvt,work,lwork,ifail)
-#endif
-     !
-   end subroutine LU_inversion
-   !
-   !==============================
-   ! EIGENVALUES AND EIGENVECTORS 
-   !==============================
-   !
-   subroutine heev(msize,M,E_real,work,lwork,rwk,ifail)
-     !
-     integer,    intent(in)    :: msize,lwork
-     integer,    intent(out)   :: ifail
-     real(SP),   intent(out)   :: E_real(*), rwk(*)
-     complex(SP),intent(out)   :: work(*)
-     complex(SP),intent(inout) :: M(msize,*)
-     !
-#if defined _DOUBLE
-   call ZHEEV('V','U',msize,M,msize,E_real,work,lwork,rwk,ifail)
-#else
-   call CHEEV('V','U',msize,M,msize,E_real,work,lwork,rwk,ifail)
-#endif
-     !
-   end subroutine heev 
-   !
-   subroutine geev(msize,M,E_cmpl,V_left,V_right,work,lwork,rwk,ifail)
-     !
-     integer,    intent(in)    :: msize,lwork
-     integer,    intent(out)   :: ifail
-     real(SP),   intent(out)   :: rwk(*)
-     complex(SP),intent(out)   :: E_cmpl(*),V_left(msize,*),V_right(msize,*),work(*)
-     complex(SP),intent(inout) :: M(msize,*)
-     !
-#if defined _DOUBLE
-   call ZGEEV('V','V',msize,M,msize,E_cmpl,V_left,msize,V_right,msize,work,lwork,rwk,ifail)
-#else
-   call CGEEV('V','V',msize,M,msize,E_cmpl,V_left,msize,V_right,msize,work,lwork,rwk,ifail)
-#endif
-     !
-   end subroutine geev
-   !
 end module linear_algebra
+
diff --git a/src/nloptics/NL_Berry_current.F b/src/nloptics/NL_Berry_current.F
index 95db4eb887..0aeef2b2d8 100644
--- a/src/nloptics/NL_Berry_current.F
+++ b/src/nloptics/NL_Berry_current.F
@@ -127,7 +127,7 @@ subroutine NL_Berry_current(en,Xk,k_map,V_bands,NL_J)
  ! 
 !$omp parallel do default(shared), private(i1)
  do id=1,3
-   NL_J(id)=-sum(NL_J_red(:)*a(:,id))/(4.0*pi)
+   NL_J(id)=sum(NL_J_red(:)*a(:,id))/(4.0*pi)
  enddo
 !$omp end parallel do
  !
diff --git a/src/nloptics/NL_current.F b/src/nloptics/NL_current.F
index 917539d684..ef7a33c2da 100644
--- a/src/nloptics/NL_current.F
+++ b/src/nloptics/NL_current.F
@@ -41,12 +41,12 @@ subroutine NL_current(k,E,V_input,NL_J)
  !
  ! A : Current
  !
- call NL_average_operator(V_VALUE=NL_J(4:6), V_MATRIX=DIP_v(:,NL_bands(1):NL_bands(2),NL_bands(1):NL_bands(2),:,:),  &
+ call NL_average_operator(V_VALUE=NL_J(4:6), V_MATRIX=-DIP_v(:,NL_bands(1):NL_bands(2),NL_bands(1):NL_bands(2),:,:),  &
      &  V_bands=V_input,k=k,en=E,TRANS=.TRUE.,nK_mem=PAR_Xk_nibz)
  !
  ! DEBUG <
  ! Calculate current using density matrix
- ! call NL_average_operator(V_VALUE=NL_J(4:6), V_MATRIX=DIP_v(:,NL_bands(1):NL_bands(2),NL_bands(1):NL_bands(2),:,:),  &
+ ! call NL_average_operator(V_VALUE=NL_J(4:6), V_MATRIX=-DIP_v(:,NL_bands(1):NL_bands(2),NL_bands(1):NL_bands(2),:,:),  &
  !     &  dG=dG,k=k,en=E,TRANS=.TRUE.,nK_mem=PAR_Xk_nibz)
  ! DEBUG >
  !
diff --git a/ypp/excitons/excitons_bands.F b/ypp/excitons/excitons_bands.F
index dae520a8e3..68f6d82cee 100644
--- a/ypp/excitons/excitons_bands.F
+++ b/ypp/excitons/excitons_bands.F
@@ -34,32 +34,33 @@ subroutine excitons_bands(k,Xk,en,Xen,q)
  ! Work space
  !
  integer :: iq,i_c,i_l,ID_INTERP_EXC,i_E
- real(SP), allocatable    :: BS_all_E(:,:),BSE_interp_E(:,:),values(:)
+ real(SP), allocatable    :: BSE_interp_E(:,:),values(:)
  type(bz_samp)            :: GRID_q
  character(schlen)        :: file_name
  character(schlen), allocatable :: headings(:)
- logical                  :: GRID_interpolate,l_prt_dos
+ logical                  :: BANDS_built_in,GRID_interpolate,l_prt_dos
  real(SP)                 :: tmp_q(3)
  real(SP)                 :: dos_E(DOS_E_steps),exc_DOS(DOS_E_steps)
+ real(SP)                 :: BS_all_E(EXCITONS_n_user_states,q%nibz)
  type(PP_indexes)         :: px
  !
  ! Parse the different interpolations
  !
  call parser('PrtDOS',l_prt_dos)
+ call parser('BANDS_built_in',BANDS_built_in)
  GRID_interpolate    = all(INTERP_grid>0)
  !
  if(l_prt_dos.and..not.GRID_interpolate) call error("You need to specify a Q-grid for the DOS")
  !
  ! Allocate arrays for all eigenvalues/eigenvectors
  ! 
- YAMBO_ALLOC(BS_all_E,(EXCITONS_n_user_states,q%nibz))
  YAMBO_ALLOC(values,(EXCITONS_n_user_states+4))
  allocate(headings(EXCITONS_n_user_states+4))
  !
  ! Read and interpolate excitons dispersion
  !
  ID_INTERP_EXC=1
- call excitons_interpolate_setup(k,Xk,en,Xen,q,ID_INTERP_EXC,.TRUE.)
+ call excitons_interpolate_setup(k,Xk,en,Xen,q,BS_all_E,ID_INTERP_EXC,.TRUE.)
  !
  ! Interpolate and write on disk
  !
@@ -72,7 +73,9 @@ subroutine excitons_bands(k,Xk,en,Xen,q)
    YAMBO_ALLOC(BSE_interp_E,(EXCITONS_n_user_states,CIRCUIT_k%nibz))      
    call INTERPOLATION_BZ(K=CIRCUIT_k,NK=CIRCUIT_k%nbz,R1D=BSE_interp_E,ID=ID_INTERP_EXC)
    !
-   call print_BANDS()
+   call print_interpolated_BANDS()
+   !
+   if (BANDS_built_in) call print_built_in_BANDS()
    !
  endif
  !
@@ -150,7 +153,7 @@ subroutine print_DOS()
      !
    end subroutine print_DOS
    ! 
-   subroutine print_BANDS()
+   subroutine print_interpolated_BANDS()
      implicit none
      !
      headings(1)=" |q| (a.u.) "
@@ -181,7 +184,74 @@ subroutine print_BANDS()
      enddo
      call of_open_close(trim(file_name))
      !
-   end subroutine print_BANDS
+   end subroutine print_interpolated_BANDS
+   ! 
+   subroutine print_built_in_BANDS()
+     implicit none
+     !
+     integer               :: i_point,n_points,n_points_max,iq_bz_grid,iq_ibz_grid
+     real(SP)              :: value_k,values(EXCITONS_n_user_states+4)
+     integer,  allocatable :: Grid_to_path_map(:,:)
+     real(SP), allocatable :: tmp_var(:,:),tmp_q(:,:),tmp_k_dist(:,:)
+     !
+     call k_ibz2bz(q,'iku',.true.)
+     !
+     YAMBO_ALLOC(Grid_to_path_map,(USER_k%nbz,q%nbz))
+     call define_grid_map(q,USER_k,Grid_to_path_map,n_points_max)
+     YAMBO_ALLOC(tmp_var,(EXCITONS_n_user_states,n_points_max))
+     !
+     YAMBO_ALLOC(     tmp_q,(3,n_points_max))
+     YAMBO_ALLOC(tmp_k_dist,(3,n_points_max))
+     !
+     headings(1)=" |q| (a.u.) "
+     do i_c=1,EXCITONS_n_user_states
+        i_l=EXCITONS_user_indexes(i_c)
+        headings(i_c+1)=' e'//intc(i_l)
+     enddo
+     headings(EXCITONS_n_user_states+2:EXCITONS_n_user_states+4)=&
+&           (/"q_x ("//trim(coo_out)//")","q_y ("//trim(coo_out)//")","q_z ("//trim(coo_out)//")"/)
+     !
+     file_name="excitons_built_in"
+     call of_open_close(trim(file_name),'ot')
+     call msg('o '//trim(file_name),"#",headings,INDENT=0,USE_TABS=.true.)
+     call msg('o '//trim(file_name),"#")
+     !
+     values=0._SP
+     !
+     do iq=1,USER_k%nibz
+       !
+       if (iq>1) value_k=value_k+iku_v_norm(USER_k%pt(iq,:3)-USER_k%pt(iq-1,:3))
+       !
+       n_points=0
+       !
+       do iq_bz_grid=1,q%nbz
+         if( Grid_to_path_map(iq,iq_bz_grid)==-1 ) cycle
+         n_points=n_points+1
+         iq_ibz_grid=q%sstar(iq_bz_grid,1)
+         !
+         tmp_k_dist(:,n_points)=q%ptbz(iq_bz_grid,:)-USER_k%pt(iq,:)
+         tmp_q(:,n_points)=q%ptbz(iq_bz_grid,:)
+         !
+         tmp_var(:,n_points)=BS_all_E(:,iq_ibz_grid)
+         !
+       enddo
+       !
+       do i_point=1,n_points
+         !
+         call K_transform(tmp_q(:,i_point),'iku')
+         !
+         values(1)=value_k+iku_v_norm(tmp_k_dist(:,i_point))
+         values(2:EXCITONS_n_user_states+1)=tmp_var(:,i_point)*HA2EV
+         values(EXCITONS_n_user_states+2:EXCITONS_n_user_states+4)=tmp_q(:,i_point)
+         !
+         call msg('o '//trim(file_name),' ',values,INDENT=0,USE_TABS=.true.)
+       enddo
+       !
+     enddo
+     !
+     call of_open_close(trim(file_name))
+     !
+   end subroutine print_built_in_BANDS
    !
    subroutine print_INTERP_GRID()
      implicit none
diff --git a/ypp/excitons/excitons_interpolate_setup.F b/ypp/excitons/excitons_interpolate_setup.F
index aa5019c088..c71c4a10c0 100644
--- a/ypp/excitons/excitons_interpolate_setup.F
+++ b/ypp/excitons/excitons_interpolate_setup.F
@@ -5,7 +5,7 @@
 !
 ! Authors (see AUTHORS file for details): CA
 !
-subroutine excitons_interpolate_setup(k,Xk,en,Xen,q,ID_INTERP_EXC,report)
+subroutine excitons_interpolate_setup(k,Xk,en,Xen,q,BS_all_E,ID_INTERP_EXC,report)
  !
  ! This subroutine read and interpolate exciton 
  !
@@ -22,21 +22,19 @@ subroutine excitons_interpolate_setup(k,Xk,en,Xen,q,ID_INTERP_EXC,report)
  !
  type(bz_samp) ::Xk,k,q
  type(levels)  ::Xen,en
+ real(SP),intent(out)  :: BS_all_E(EXCITONS_n_user_states,q%nibz)
  logical, intent(in) :: report
  integer, intent(inout) :: ID_INTERP_EXC
  !
  ! Work space
  !
  integer :: iq,i_c,i_l,io_err
- real(SP), allocatable    :: BS_all_E(:,:)
  real(SP), allocatable    :: values(:)
  real(SP) :: tmp_q(3)
  character(schlen), allocatable :: headings(:)
  !
  ! Allocate arrays for all eigenvalues/eigenvectors
  ! 
- YAMBO_ALLOC(BS_all_E,(EXCITONS_n_user_states,q%nibz))
- !
  call section('*','Excitons Interpolation')
  !
  call excitons_read(k,Xk,en,Xen,1,"clean",io_err)
diff --git a/ypp/plotting/plot_interpolated_values.F b/ypp/plotting/plot_interpolated_values.F
index 9039bd9eef..03d35e19cb 100644
--- a/ypp/plotting/plot_interpolated_values.F
+++ b/ypp/plotting/plot_interpolated_values.F
@@ -11,7 +11,7 @@ subroutine plot_interpolated_values(Xk,Xen,Ef,LOCAL_k,IDs,dims,nquantities,nfile
  use pars,           ONLY:SP,schlen
  use com,            ONLY:msg,of_open_close
  use electrons,      ONLY:levels,n_sp_pol,n_spinor
- use vec_operate,    ONLY:v_norm,iku_v_norm
+ use vec_operate,    ONLY:iku_v_norm
  use R_lattice,      ONLY:bz_samp
  use stderr,         ONLY:intc
  use YPPm,           ONLY:coo_out,K_transform,CIRCUIT_E_db,CIRCUIT_k_label
@@ -47,7 +47,6 @@ subroutine plot_interpolated_values(Xk,Xen,Ef,LOCAL_k,IDs,dims,nquantities,nfile
  ! Allocs
  !
  integer,  allocatable :: Grid_to_path_map(:,:)
- real(SP), allocatable :: circuit_versor(:,:),circuit_dist(:,:)
  real(SP), allocatable :: auxiliary_var(:,:,:,:),tmp_k(:,:),tmp_k_dist(:,:)
  !
  PLOT_interpolated = index(trim(basename),"interpolated")>0
@@ -66,45 +65,11 @@ subroutine plot_interpolated_values(Xk,Xen,Ef,LOCAL_k,IDs,dims,nquantities,nfile
 #if defined _YPP_SC
  proj_wfc=(trim(SC_neq_kind)=="matsubara")
 #endif
- !
- ! Define a map between k-points in grid and nearest k-point in circuit
  !
  if (PLOT_built_in) then
-   !
-   YAMBO_ALLOC(circuit_versor,(3,LOCAL_k%nbz))
-   YAMBO_ALLOC(circuit_dist  ,(3,LOCAL_k%nbz))
    !
    YAMBO_ALLOC(Grid_to_path_map,(LOCAL_k%nbz,Xk%nbz))
-   Grid_to_path_map =-1
-   !
-   do ik_local=1,LOCAL_k%nbz-1
-     tmp_dist=LOCAL_k%pt(ik_local+1,:)-LOCAL_k%pt(ik_local,:)
-     circuit_dist  (:,ik_local)=tmp_dist
-     circuit_versor(:,ik_local)=tmp_dist/v_norm(tmp_dist)
-   enddo
-   circuit_versor(:,ik_local)=circuit_versor(:,ik_local-1)
-   !
-   n_points_max=0
-   do ik_local=1,LOCAL_k%nbz
-     !
-     n_points=0
-     do ik_bz_grid=1,Xk%nbz
-       !
-       tmp_dist=Xk%ptbz(ik_bz_grid,:)-LOCAL_k%pt(ik_local,:)
-       !
-       if ((abs(v_norm(tmp_dist)-dot_product(tmp_dist,circuit_versor(:,ik_local)))<1.E-5_SP).and.&
-       &    iku_v_norm(tmp_dist)<=iku_v_norm(circuit_dist(:,ik_local))                            ) then
-         Grid_to_path_map(ik_local,ik_bz_grid)=ik_bz_grid
-         n_points=n_points+1
-       endif
-       n_points_max=max(n_points,n_points_max)
-       !
-     enddo
-     !
-   enddo
-   !
-   YAMBO_FREE(circuit_versor)
-   YAMBO_FREE(circuit_dist  )
+   call define_grid_map(Xk,Local_k,Grid_to_path_map,n_points_max)
    !
    if(n_points_max>1) then
      YAMBO_ALLOC(auxiliary_var,(dims(1):dims(2),maxval(nfiles),nquantities,n_points_max-1))
@@ -320,3 +285,61 @@ subroutine plot_interpolated_values(Xk,Xen,Ef,LOCAL_k,IDs,dims,nquantities,nfile
  endif
  !
 end subroutine plot_interpolated_values
+!
+!
+subroutine define_grid_map(Xk,Local_k,Grid_to_path_map,n_points_max)
+ !
+ use pars,           ONLY:SP
+ use R_lattice,      ONLY:bz_samp
+ use vec_operate,    ONLY:v_norm,iku_v_norm
+ !
+#include<y_memory.h>
+ !
+ type(bz_samp),  intent(in)  :: Xk,LOCAL_k
+ integer,        intent(out) :: Grid_to_path_map(LOCAL_k%nbz,Xk%nbz)
+ integer,        intent(out) :: n_points_max 
+ !
+ ! Workspace
+ !
+ integer               :: n_points,ik_local,ik_bz_grid
+ real(SP)              :: tmp_dist(3)
+ real(SP), allocatable :: circuit_versor(:,:),circuit_dist(:,:)
+ !
+ ! Define a map between k-points in grid and nearest k-point in circuit
+ !
+ YAMBO_ALLOC(circuit_versor,(3,LOCAL_k%nbz))
+ YAMBO_ALLOC(circuit_dist  ,(3,LOCAL_k%nbz))
+ !
+ Grid_to_path_map =-1
+ n_points=1
+ !
+ do ik_local=1,LOCAL_k%nbz-1
+   tmp_dist=LOCAL_k%pt(ik_local+1,:)-LOCAL_k%pt(ik_local,:)
+   circuit_dist  (:,ik_local)=tmp_dist
+   circuit_versor(:,ik_local)=tmp_dist/v_norm(tmp_dist)
+ enddo
+ circuit_versor(:,ik_local)=circuit_versor(:,ik_local-1)
+ !
+ n_points_max=0
+ do ik_local=1,LOCAL_k%nbz
+   !
+   n_points=0
+   do ik_bz_grid=1,Xk%nbz
+     !
+     tmp_dist=Xk%ptbz(ik_bz_grid,:)-LOCAL_k%pt(ik_local,:)
+     !
+     if ((abs(v_norm(tmp_dist)-dot_product(tmp_dist,circuit_versor(:,ik_local)))<1.E-5_SP).and.&
+     &    iku_v_norm(tmp_dist)<=iku_v_norm(circuit_dist(:,ik_local))                            ) then
+       Grid_to_path_map(ik_local,ik_bz_grid)=ik_bz_grid
+       n_points=n_points+1
+     endif
+     n_points_max=max(n_points,n_points_max)
+     !
+   enddo
+   !
+ enddo
+ !
+ YAMBO_FREE(circuit_versor)
+ YAMBO_FREE(circuit_dist  )
+ !
+end subroutine define_grid_map