New configure regenerated

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

install/configure

@@ -2722,6 +2722,7 @@ $as_echo "$as_me: WARNING: incorrect host name ?" >&2;}
         test -d /proc/cray_xt && arch=crayxt
 	# workaround for IBM BG machines
         test -d /bgsys && arch=ppc64-bg
+        test -f /bgsys/drivers/ppcfloor/bin/runjob && arch=ppc64-bgq
 fi
 echo checking architecture... $arch
 
@@ -2789,7 +2790,7 @@ ppc64-mn )
         try_arflags="ruv"
         ;;
 # IBM BlueGene
-ppc64-bg )
+ppc64-bg | ppc64-bgq )
 	if test "$use_openmp" -eq 0 ; then
           try_mpif90="mpixlf90"
           try_f90="bgxlf90"
@@ -3907,11 +3908,11 @@ cray*:* )
 necsx:* )
         try_cc="sxcc"
         ;;
-ppc64-bg:*xlf90_r )
+ppc64-bg*:*xlf90_r )
         try_cc="bgxlc_r"
         try_f77="bgxlf_r"
         ;;
-ppc64-bg:*xlf90 )
+ppc64-bg*:*xlf90 )
         try_cc="bgxlc"
         try_f77="bgxlf"
         ;;
@@ -5144,7 +5145,21 @@ ppc64-bg:*xlf* )
         try_f90flags="\$(FFLAGS) -qsuffix=cpp=f90"
         try_fflags_noopt="-q32 -O0"
         try_ldflags="-q32"
-        try_ldflags_openmp="-qsmp -qthreaded"
+        try_ldflags_openmp="-qsmp=omp -qthreaded"
+        pre_fdflags="-WF,"
+        xlf_flags=1
+        ;;
+ppc64-bgq:*xlf* )
+    if test "$use_debug" -eq 1; then
+        try_fflags="-qalias=noaryovrlp:nointptr -g -C -qdpc=e"
+    else
+        try_fflags="-qalias=noaryovrlp:nointptr -O3 -qstrict -qdpc=e -qarch=qp -qtune=qp"
+    fi
+        try_fflags_openmp="-qsmp=omp -qtm -qthreaded"
+        try_f90flags="\$(FFLAGS) -qsuffix=cpp=f90"
+        try_fflags_noopt="-O0"
+        try_ldflags=""
+        try_ldflags_openmp="-qstatic -qsmp=omp -qtm -qthreaded"
         pre_fdflags="-WF,"
         xlf_flags=1
         ;;
@@ -5220,6 +5235,9 @@ ppc64-mn:* )
 ppc64-bg:* )
         try_cflags="-O3 -q32"
         ;;
+ppc64-bgq:* )
+        try_cflags="-O3"
+        ;;
 ppc64:xlc*)
         try_cflags="-O3 -q64 -qthreaded"
         c_ldflags="-q64"
@@ -7690,7 +7708,7 @@ if test "$ac_res" != no; then :
 fi
 
             ;;
-        ppc64-bg )
+        ppc64-bg | ppc64-bgq )
                 # check for esslbg
                 unset ac_cv_search_dcft # clear cached value
                 FFLAGS="$test_fflags"
@@ -8036,7 +8054,7 @@ then
         case "$arch" in
         aix | ppc64-bg )
                 # check for mass (in several directories)
-                try_libdirs="/opt/ibmcmp/xlmass/bg/4.4/bglib /cineca/lib /cineca/lib/mass"
+                try_libdirs="/opt/ibmcmp/xlmass/bg/7.3/bglib64 /opt/ibmcmp/xlmass/bg/4.4/bglib /cineca/lib /cineca/lib/mass"
                 try_libdirs="$libdirs $try_libdirs $ld_library_path"
 
                 for dir in none $try_libdirs
@@ -8180,6 +8198,10 @@ if test "$mass_libs" != ""; then
    # BlueGene wants this when mass libs are loaded, SP6 doesn't want this!
      ldflags="$ldflags -Wl,--allow-multiple-definition"
    fi
+   if test "$arch" = "ppc64-bgq"; then
+   # BlueGene wants this when mass libs are loaded, SP6 doesn't want this!
+     ldflags="$ldflags -Wl,--allow-multiple-definition"
+   fi
 fi
 
 echo setting MASS_LIBS... $mass_libs
@@ -8577,9 +8599,15 @@ if test "$ac_res" != no; then :
                    try_dflags="$try_dflags -D__SCALAPACK"
 fi
 
+    else
+        # scalapack provided in SCALAPACK_LIBS - not checked!
+        have_scalapack=1
+        try_dflags="$try_dflags -D__SCALAPACK"
     fi
 done
 
+echo setting SCALAPACK_LIBS... $scalapack_libs
+
 # preprocessing flag for openmp (experimental)
 if test "$use_openmp" -eq 1 ; then try_dflags="$try_dflags -D__OPENMP" ; fi