ke all' now works also when ELPA is enabled, linking occours properly.

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@9921 c92efa57-630b-4861-b058-cf58834340f0

install/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for ESPRESSO 5.0.1.
+# Generated by GNU Autoconf 2.65 for ESPRESSO 5.0.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ESPRESSO'
 PACKAGE_TARNAME='espresso'
-PACKAGE_VERSION='5.0.1'
-PACKAGE_STRING='ESPRESSO 5.0.1'
+PACKAGE_VERSION='5.0.2'
+PACKAGE_STRING='ESPRESSO 5.0.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1267,7 +1267,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ESPRESSO 5.0.1 to adapt to many kinds of systems.
+\`configure' configures ESPRESSO 5.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1331,7 +1331,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ESPRESSO 5.0.1:";;
+     short | recursive ) echo "Configuration of ESPRESSO 5.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1441,7 +1441,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ESPRESSO configure 5.0.1
+ESPRESSO configure 5.0.2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2096,7 +2096,7 @@ 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 ESPRESSO $as_me 5.0.1, which was
+It was created by ESPRESSO $as_me 5.0.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -4999,12 +4999,10 @@ ia32:ifort* | ia64:ifort* | x86_64:ifort* | mac686:ifort* | crayxt*:ifort* )
         pre_fdflags="-fpp "
         ;;
 ia32:pgf* | ia64:pgf* | x86_64:pgf* )
-# in try_fflags we use -O3 instead of -fast because some *.f files in Multigrid
-# confuse the optimizer when option -fast is enabled
 	    try_fflags_nomain="-Mnomain"
-        try_fflags="-O3 -r8"
+        try_fflags="-fast -r8"
         try_fflags_openmp="-mp"
-        try_f90flags="-fast -Mcache_align -r8"
+        try_f90flags="-fast -r8 -Mcache_align"
         try_fflags_noopt="-O0"
         try_ldflags=""
         try_ldflags_openmp="-mp"
@@ -8705,7 +8703,7 @@ done
 # ELPA iff SCALAPACK
 elpa_libs_switch="disabled"
 if test "$with_elpa" -eq 1 && test "$have_scalapack" -eq 1; then
-    scalapack_libs="../../ELPA/libelpa.a $scalapack_libs"
+    scalapack_libs="\$(TOPDIR)/ELPA/libelpa.a $scalapack_libs"
     try_dflags="$try_dflags -D__ELPA"
     elpa_libs_switch="enabled"
 fi
@@ -9475,7 +9473,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ESPRESSO $as_me 5.0.1, which was
+This file was extended by ESPRESSO $as_me 5.0.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9537,7 +9535,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ESPRESSO config.status 5.0.1
+ESPRESSO config.status 5.0.2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

install/configure.ac

@@ -1878,7 +1878,7 @@ done
 # ELPA iff SCALAPACK
 elpa_libs_switch="disabled"
 if test "$with_elpa" -eq 1 && test "$have_scalapack" -eq 1; then 
-    scalapack_libs="../../ELPA/libelpa.a $scalapack_libs"
+    scalapack_libs="\$(TOPDIR)/ELPA/libelpa.a $scalapack_libs"
     try_dflags="$try_dflags -D__ELPA"
     elpa_libs_switch="enabled"    
 fi

install/make.sys.in

@@ -24,6 +24,10 @@
 	$(CC) $(CFLAGS)  -c $<
 
 @SET_MAKE@
+
+# topdir for linking espresso libs with plugins
+TOPDIR = @topdir@
+
 # DFLAGS  = precompilation options (possible arguments to -D and -U)
 #           used by the C compiler and preprocessor
 # FDFLAGS = as DFLAGS, for the f90 compiler
@@ -145,6 +149,3 @@ LIBS           = $(SCALAPACK_LIBS) $(LAPACK_LIBS) $(FFT_LIBS) $(BLAS_LIBS) $(MPI
 
 # wget or curl - useful to download from network
 WGET = @wget@
-
-# topdir for linking espresso libs with plugins
-TOPDIR = @topdir@