diff --git a/ELPA_2014.06/Makefile.am b/ELPA_2014.06/Makefile.am
index d47961339a7e3d93c0d1aae807c77d77829d671c..58deb8877b86f775b584e61daabca04d38f869f9 100644
--- a/ELPA_2014.06/Makefile.am
+++ b/ELPA_2014.06/Makefile.am
@@ -2,16 +2,21 @@
 
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
-AM_FCFLAGS = $(SCALAPACK_FCFLAGS) $(OPENMP_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
-AM_LDFLAGS = $(SCALAPACK_LDFLAGS) $(OPENMP_FCFLAGS)
+AM_FCFLAGS = $(SCALAPACK_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
+AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
 
 # libelpa
 if WITH_OPENMP
 lib_LTLIBRARIES = libelpa-@PACKAGE_VERSION@_mt.la
+libelpa_@PACKAGE_VERSION@_mt_la_LINK = $(FCLINK)
+libelpa_@PACKAGE_VERSION@_mt_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
 else
 lib_LTLIBRARIES = libelpa-@PACKAGE_VERSION@.la
+libelpa_@PACKAGE_VERSION@_la_LINK = $(FCLINK)
+libelpa_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
 endif
 
+
 ##rule to produce fortran config file:
 #config_f90.h: ./config.h
 #	grep "^#define" ./config.h > $@
@@ -136,12 +141,6 @@ endif
 #endif
 #endif
 
-if WITH_OPENMP
-libelpa_@PACKAGE_VERSION@_mt_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
-else
-libelpa_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
-endif
-
 # install any .mod files in the include/ dir
 elpa_includedir = $(includedir)/elpa-@PACKAGE_VERSION@
 nobase_elpa_include_HEADERS = $(wildcard modules/*)
@@ -286,5 +285,8 @@ distclean-local:
 
 EXTRA_DIST = fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk
 
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status libtool
 
 @FORTRAN_MODULE_DEPS@
diff --git a/ELPA_2014.06/Makefile.in b/ELPA_2014.06/Makefile.in
index 4814d6a06df0569dd82d91465c651c96575e25b8..babe1632495c09dc3895c9516eb1546096d77160 100644
--- a/ELPA_2014.06/Makefile.in
+++ b/ELPA_2014.06/Makefile.in
@@ -129,7 +129,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 	$(top_srcdir)/fdep/fortran_dependencies.m4 \
-	$(top_srcdir)/m4/ax_prog_cxx_mpi.m4 \
 	$(top_srcdir)/m4/ax_prog_fc_mpi.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -208,14 +207,6 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @WITH_OPENMP_FALSE@	$(am__objects_12) $(am__objects_13)
 libelpa_@PACKAGE_VERSION@_la_OBJECTS =  \
 	$(am_libelpa_@PACKAGE_VERSION@_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libelpa_@PACKAGE_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(libelpa_@PACKAGE_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_OPENMP_FALSE@am_libelpa_@PACKAGE_VERSION@_la_rpath = -rpath \
 @WITH_OPENMP_FALSE@	$(libdir)
 libelpa_@PACKAGE_VERSION@_mt_la_LIBADD =
@@ -255,16 +246,16 @@ am__libelpa_@PACKAGE_VERSION@_mt_la_SOURCES_DIST = src/elpa1.F90 \
 @WITH_OPENMP_TRUE@	$(am__objects_25) $(am__objects_26)
 libelpa_@PACKAGE_VERSION@_mt_la_OBJECTS =  \
 	$(am_libelpa_@PACKAGE_VERSION@_mt_la_OBJECTS)
-libelpa_@PACKAGE_VERSION@_mt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(libelpa_@PACKAGE_VERSION@_mt_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_OPENMP_TRUE@am_libelpa_@PACKAGE_VERSION@_mt_la_rpath = -rpath \
 @WITH_OPENMP_TRUE@	$(libdir)
 PROGRAMS = $(bin_PROGRAMS)
 am_elpa1_test_complex_OBJECTS = test/test_complex.$(OBJEXT)
 elpa1_test_complex_OBJECTS = $(am_elpa1_test_complex_OBJECTS)
 elpa1_test_complex_DEPENDENCIES = $(build_lib)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_elpa1_test_real_OBJECTS = test/test_real.$(OBJEXT)
 elpa1_test_real_OBJECTS = $(am_elpa1_test_real_OBJECTS)
 elpa1_test_real_DEPENDENCIES = $(build_lib)
@@ -685,13 +676,11 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MPICXX = @MPICXX@
 MPIFC = @MPIFC@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPENMP_FCFLAGS = @OPENMP_FCFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -772,12 +761,16 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_amd_bulldozer_kernel = @with_amd_bulldozer_kernel@
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-AM_FCFLAGS = $(SCALAPACK_FCFLAGS) $(OPENMP_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
-AM_LDFLAGS = $(SCALAPACK_LDFLAGS) $(OPENMP_FCFLAGS)
+AM_FCFLAGS = $(SCALAPACK_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
+AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
 @WITH_OPENMP_FALSE@lib_LTLIBRARIES = libelpa-@PACKAGE_VERSION@.la
 
 # libelpa
 @WITH_OPENMP_TRUE@lib_LTLIBRARIES = libelpa-@PACKAGE_VERSION@_mt.la
+@WITH_OPENMP_TRUE@libelpa_@PACKAGE_VERSION@_mt_la_LINK = $(FCLINK)
+@WITH_OPENMP_TRUE@libelpa_@PACKAGE_VERSION@_mt_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
+@WITH_OPENMP_FALSE@libelpa_@PACKAGE_VERSION@_la_LINK = $(FCLINK)
+@WITH_OPENMP_FALSE@libelpa_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
 
 #config_f90.h: ./config.h
 #	grep "^#define" ./config.h > $@
@@ -807,8 +800,6 @@ AM_LDFLAGS = $(SCALAPACK_LDFLAGS) $(OPENMP_FCFLAGS)
 #                                           src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
 #endif
 #endif
-@WITH_OPENMP_TRUE@libelpa_@PACKAGE_VERSION@_mt_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
-@WITH_OPENMP_FALSE@libelpa_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
 
 # install any .mod files in the include/ dir
 elpa_includedir = $(includedir)/elpa-@PACKAGE_VERSION@
@@ -882,6 +873,7 @@ CLEANFILES = \
 	*.i
 
 EXTRA_DIST = fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1025,10 +1017,10 @@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo:  \
 	src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp)
 
 libelpa-@PACKAGE_VERSION@.la: $(libelpa_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@_la_DEPENDENCIES) $(EXTRA_libelpa_@PACKAGE_VERSION@_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libelpa_@PACKAGE_VERSION@_la_LINK) $(am_libelpa_@PACKAGE_VERSION@_la_rpath) $(libelpa_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@_la_LIBADD) $(LIBS)
+	$(AM_V_GEN)$(libelpa_@PACKAGE_VERSION@_la_LINK) $(am_libelpa_@PACKAGE_VERSION@_la_rpath) $(libelpa_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@_la_LIBADD) $(LIBS)
 
 libelpa-@PACKAGE_VERSION@_mt.la: $(libelpa_@PACKAGE_VERSION@_mt_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@_mt_la_DEPENDENCIES) $(EXTRA_libelpa_@PACKAGE_VERSION@_mt_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libelpa_@PACKAGE_VERSION@_mt_la_LINK) $(am_libelpa_@PACKAGE_VERSION@_mt_la_rpath) $(libelpa_@PACKAGE_VERSION@_mt_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@_mt_la_LIBADD) $(LIBS)
+	$(AM_V_GEN)$(libelpa_@PACKAGE_VERSION@_mt_la_LINK) $(am_libelpa_@PACKAGE_VERSION@_mt_la_rpath) $(libelpa_@PACKAGE_VERSION@_mt_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@_mt_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1968,6 +1960,8 @@ clean-local:
 
 distclean-local:
 	-rm config-f90.h
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status libtool
 
 @FORTRAN_MODULE_DEPS@
 
diff --git a/ELPA_2014.06/configure b/ELPA_2014.06/configure
index f3e81fdff1f40022d90019c228efb3efb0a93012..40da424e1d9144a76469681e3b3d1314a7dc9713 100755
--- a/ELPA_2014.06/configure
+++ b/ELPA_2014.06/configure
@@ -696,7 +696,6 @@ WITH_REAL_GENERIC_KERNEL_FALSE
 WITH_REAL_GENERIC_KERNEL_TRUE
 SCALAPACK_FCFLAGS
 SCALAPACK_LDFLAGS
-OPENMP_CXXFLAGS
 OPENMP_FCFLAGS
 WITH_OPENMP_FALSE
 WITH_OPENMP_TRUE
@@ -710,10 +709,9 @@ MPIFC
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
-CXXFLAGS
 ac_ct_CXX
+CXXFLAGS
 CXX
-MPICXX
 am__fastdepCCAS_FALSE
 am__fastdepCCAS_TRUE
 CCASDEPMODE
@@ -853,7 +851,6 @@ LIBS
 CPPFLAGS
 CCAS
 CCASFLAGS
-MPICXX
 CXX
 CXXFLAGS
 CCC
@@ -1551,7 +1548,6 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CCAS        assembler compiler command (defaults to CC)
   CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
-  MPICXX      MPI C++ compiler command
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   MPIFC       MPI Fortran compiler command
@@ -1721,52 +1717,6 @@ fi
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  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\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 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_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  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_cxx_try_link
-
 # ac_fn_fc_try_compile LINENO
 # ---------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -2110,6 +2060,52 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 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_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  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_cxx_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -4602,195 +4598,7 @@ fi
 
 
 
-# C++
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_prog_cxx_mpi.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_CXX_MPI([MPI-WANTED-TEST[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
-#
-# DESCRIPTION
-#
-#   This macro tries to find out how to compile C++ programs that use MPI
-#   (Message Passing Interface), a standard API for parallel process
-#   communication (see http://www-unix.mcs.anl.gov/mpi/).  The macro has to
-#   be used instead of the standard macro AC_PROG_CXX and will replace the
-#   standard variable CXX with the found compiler.
-#
-#   MPI-WANTED-TEST is used to test whether MPI is actually wanted by the
-#   user. If MPI-WANTED_TEST is omitted or if it succeeds, the macro will
-#   try to find out how to use MPI, if it fails, the macro will call
-#   AC_PROG_CC to find a standard C compiler instead.
-#
-#   When MPI is found, ACTION-IF-FOUND will be executed, if MPI is not found
-#   (or MPI-WANTED-TEST fails) ACTION-IF-NOT-FOUND is executed. If
-#   ACTION-IF-FOUND is not set, the macro will define HAVE_MPI.
-#
-#   The following example demonstrates usage of the macro:
-#
-#     # If --with-mpi=auto is used, try to find MPI, but use standard C compiler if it is not found.
-#     # If --with-mpi=yes is used, try to find MPI and fail if it isn't found.
-#     # If --with-mpi=no is used, use a standard C compiler instead.
-#     AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi],
-#         [compile with MPI (parallelization) support. If none is found,
-#         MPI is not used. Default: auto])
-#     ],,[with_mpi=auto])
-#
-#     AX_PROG_CXX_MPI([test x"$with_mpi" != xno],[use_mpi=yes],[
-#       use_mpi=no
-#       if test x"$with_mpi" = xyes; then
-#         AC_MSG_FAILURE([MPI compiler requested, but couldn't use MPI.])
-#       else
-#         AC_MSG_WARN([No MPI compiler found, won't use MPI.])
-#       fi
-#     ])
-#
-# LICENSE
-#
-#   Copyright (c) 2010,2011 Olaf Lenz <olenz@icp.uni-stuttgart.de>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 2
-
-
-
-
-
-  _ax_prog_cxx_mpi_mpi_wanted=yes
-  if test x"$_ax_prog_cxx_mpi_mpi_wanted" = xyes; then
-    if test -z "$CXX" && test -n "$MPICXX"; then
-      CXX="$MPICXX"
-    else
-      if test -n "$ac_tool_prefix"; then
-  for ac_prog in mpic++ mpicxx mpiCC sxmpic++ hcp mpxlC_r mpxlC mpixlcxx_r mpixlcxx mpg++ mpc++ mpCC cmpic++ mpiFCC CCicpc pgCC pathCC sxc++ xlC_r xlC bgxlC_r bgxlC openCC sunCC crayCC g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC
-  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$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
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in mpic++ mpicxx mpiCC sxmpic++ hcp mpxlC_r mpxlC mpixlcxx_r mpixlcxx mpg++ mpc++ mpCC cmpic++ mpiFCC CCicpc pgCC pathCC sxc++ xlC_r xlC bgxlC_r bgxlC openCC sunCC crayCC g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $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_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_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_CXX="$ac_prog"
-    $as_echo "$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_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $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
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-    fi
-  fi
-  ac_ext=cpp
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5177,125 +4985,6 @@ fi
 
 
 
-
-
-
-# Check for compiler
-# Needs to be split off into an extra macro to ensure right expansion
-# order.
-
-
-if test x"$_ax_prog_cxx_mpi_mpi_wanted" = xno; then :
-   _ax_prog_cxx_mpi_mpi_found=no
-else
-
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-    # test whether MPI_Init() is available
-    # We do not use AC_SEARCH_LIBS here, as it caches its outcome and
-    # thus disallows corresponding calls in the other AX_PROG_*_MPI
-    # macros.
-    for lib in NONE mpi mpich; do
-      save_LIBS=$LIBS
-      if test x"$lib" = xNONE; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for function MPI_Init" >&5
-$as_echo_n "checking for function MPI_Init... " >&6; }
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for function MPI_Init in -l$lib" >&5
-$as_echo_n "checking for function MPI_Init in -l$lib... " >&6; }
-        LIBS="-l$lib $LIBS"
-      fi
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-extern "C" { void MPI_Init(); }
-
-int
-main ()
-{
-MPI_Init();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-   _ax_prog_cxx_mpi_mpi_found=yes
-else
-   _ax_prog_cxx_mpi_mpi_found=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_ax_prog_cxx_mpi_mpi_found" >&5
-$as_echo "$_ax_prog_cxx_mpi_mpi_found" >&6; }
-      if test "x$_ax_prog_cxx_mpi_mpi_found" = "xyes"; then
-        break;
-      fi
-      LIBS=$save_LIBS
-    done
-
-    # Check for header
-    if test x"$_ax_prog_cxx_mpi_mpi_found" = xyes; then :
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpi.h" >&5
-$as_echo_n "checking for mpi.h... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <mpi.h>
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-   { $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; }
-         _ax_prog_cxx_mpi_mpi_found=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-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
-
-
-fi
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$_ax_prog_cxx_mpi_mpi_found" = xyes; then :
-
-        have_mpi=yes
-        :
-
-else
-
-        have_mpi=no
-                 if test x"${have_mpi}" = x"no"; then
-                  as_fn_error $? "no mpi found" "$LINENO" 5
-                  fi
-        :
-
-fi
-
-
-
-
-
 have_blas=no
 have_blacs=no
 have_mkl=no
@@ -6713,12 +6402,6 @@ fi
 $as_echo "#define WITH_OPENMP 1" >>confdefs.h
 
 
-        # Fortran
-        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
-
 
   OPENMP_FCFLAGS=
   # Check whether --enable-openmp was given.
@@ -6774,93 +6457,9 @@ $as_echo "$ac_cv_prog_fc_openmp" >&6; }
   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
-
-
-        # C++
-        ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  OPENMP_CXXFLAGS=
-  # Check whether --enable-openmp was given.
-if test "${enable_openmp+set}" = set; then :
-  enableval=$enable_openmp;
-fi
-
-  if test "$enable_openmp" != no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cxx option to support OpenMP" >&5
-$as_echo_n "checking for cxx option to support OpenMP... " >&6; }
-if ${ac_cv_prog_cxx_openmp+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifndef _OPENMP
- choke me
-#endif
-#include <omp.h>
-int main () { return omp_get_num_threads (); }
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_prog_cxx_openmp='none needed'
-else
-  ac_cv_prog_cxx_openmp='unsupported'
-	  	  	  	  	  	  	  	  	  	  	  	  	  for ac_option in -openmp -fopenmp -xopenmp -mp -omp -qsmp=omp; do
-	    ac_save_CXXFLAGS=$CXXFLAGS
-	    CXXFLAGS="$CXXFLAGS $ac_option"
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifndef _OPENMP
- choke me
-#endif
-#include <omp.h>
-int main () { return omp_get_num_threads (); }
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_prog_cxx_openmp=$ac_option
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	    CXXFLAGS=$ac_save_CXXFLAGS
-	    if test "$ac_cv_prog_cxx_openmp" != unsupported; then
-	      break
-	    fi
-	  done
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_openmp" >&5
-$as_echo "$ac_cv_prog_cxx_openmp" >&6; }
-    case $ac_cv_prog_cxx_openmp in #(
-      "none needed" | unsupported)
-        ;; #(
-      *)
-        OPENMP_CXXFLAGS=$ac_cv_prog_cxx_openmp ;;
-    esac
-  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
-
 
         # Append to flags as this influences which
         # kind of MPI library has to be used (thread-safe or not)
-        CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
         FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
 	LDFLAGS="$OPENMP_CXXFLAGS $LDFLAGS"
   fi
@@ -12010,6 +11609,7 @@ done
 
 
 
+
 func_stripname_cnf ()
 {
   case ${2} in
@@ -22095,6 +21695,17 @@ mkdir modules
 #define HIDDEN
 #endif])
 
+
+# Some part of libtool is too smart and tries to parse the output of
+#   gfortran -v
+# and catches anything that resembles a -l library link specification.
+# Unfortunately, recent versions of gfortran emit
+#   -l gfortran
+# with a space between -l and gfortran. The empty -l is then included
+# into "postdeps_FC" and causes linking errors later on.
+postdeps_FC=$(echo $postdeps_FC | sed 's/-l //g')
+echo "postdeps_FC=$postdeps_FC"
+
 ac_config_files="$ac_config_files Makefile elpa-${PACKAGE_VERSION}.pc:elpa.pc.in"
 
 cat >confcache <<\_ACEOF
diff --git a/ELPA_2014.06/configure.ac b/ELPA_2014.06/configure.ac
index 400b7a0c406104e05d752ccf18f136a8b6332358..03aaa124afd59f458733c69ede40f4bca55e6d52 100644
--- a/ELPA_2014.06/configure.ac
+++ b/ELPA_2014.06/configure.ac
@@ -46,13 +46,7 @@ AM_PROG_CC_C_O
 AM_PROG_AR
 AM_PROG_AS
 
-# C++
-m4_include([m4/ax_prog_cxx_mpi.m4])
-AX_PROG_CXX_MPI([],[have_mpi=yes],[have_mpi=no
-                 if test x"${have_mpi}" = x"no"; then
-                  AC_MSG_ERROR([no mpi found])
-                  fi])
-
+AC_PROG_CXX
 
 dnl variables needed for the tests
 
@@ -758,19 +752,10 @@ AC_ARG_WITH([openmp],
   if test x"${with_openmp}" = x"yes"; then
 	AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
 
-        # Fortran
-        AC_LANG_PUSH([Fortran])
-           AX_ELPA_OPENMP
-        AC_LANG_POP()
-
-        # C++
-        AC_LANG_PUSH([C++])
-           AX_ELPA_OPENMP
-        AC_LANG_POP()
+        AX_ELPA_OPENMP
 
         # Append to flags as this influences which
         # kind of MPI library has to be used (thread-safe or not)
-        CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
         FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
 	LDFLAGS="$OPENMP_CXXFLAGS $LDFLAGS"
   fi
@@ -1242,6 +1227,17 @@ mkdir modules
 #define HIDDEN
 #endif])
 
+
+# Some part of libtool is too smart and tries to parse the output of
+#   gfortran -v
+# and catches anything that resembles a -l library link specification.
+# Unfortunately, recent versions of gfortran emit
+#   -l gfortran
+# with a space between -l and gfortran. The empty -l is then included
+# into "postdeps_FC" and causes linking errors later on.
+postdeps_FC=$(echo $postdeps_FC | sed 's/-l //g')
+echo "postdeps_FC=$postdeps_FC"
+
 AC_CONFIG_FILES([
   Makefile
   elpa-${PACKAGE_VERSION}.pc:elpa.pc.in