From 2b8623bf741d0bbc867161810d0593ac07af517f Mon Sep 17 00:00:00 2001
From: ballabio <ballabio@c92efa57-630b-4861-b058-cf58834340f0>
Date: Wed, 24 Nov 2004 17:34:47 +0000
Subject: [PATCH] added F90FLAGS_NOOPT flag (asked by Carlo C.) [Gerardo]

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1476 c92efa57-630b-4861-b058-cf58834340f0
---
 configure            | 28 +++++++++++++++++++++++-----
 configure.ac         | 25 +++++++++++++++++++++----
 install/configure    | 28 +++++++++++++++++++++++-----
 install/configure.ac | 25 +++++++++++++++++++++----
 install/make.sys.in  |  1 +
 make.sys.in          |  1 +
 6 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index c98dee0f5..8c516a25b 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os F77 FFLAGS LDFLAGS ac_ct_F77 EXEEXT OBJEXT CC CFLAGS CPPFLAGS ac_ct_CC CPP SET_MAKE EGREP cc cflags dflags fdflags cpp cppflags f77 f90 fflags f90flags fflags_noopt pre_fdflags ifftw ld ldflags libs mylib ar arflags ranlib f90rule LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os F77 FFLAGS LDFLAGS ac_ct_F77 EXEEXT OBJEXT CC CFLAGS CPPFLAGS ac_ct_CC CPP SET_MAKE EGREP cc cflags dflags fdflags cpp cppflags f77 f90 fflags f90flags fflags_noopt f90flags_noopt pre_fdflags ifftw ld ldflags libs mylib ar arflags ranlib f90rule LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2844,6 +2844,7 @@ linux64:ifort )
 	try_fflags="-O2 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2854,6 +2855,7 @@ linux64:ifc )
 	try_fflags="-Vaxlib -O2"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2864,6 +2866,7 @@ linux64:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -2872,6 +2875,7 @@ linux32:ifort )
         try_fflags="-O2 -tpp6 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2882,6 +2886,7 @@ linux32:ifc )
         try_fflags="-Vaxlib -O2 -tpp6"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2920,6 +2925,7 @@ linux32:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -2928,6 +2934,7 @@ linux*:g95 )
 	try_fflags="-O3"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	#try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__G95"
@@ -2937,6 +2944,7 @@ aix:*xlf* )
 -qarch=auto -qtune=auto -qsuffix=cpp=f90 -qdpc -Q -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-q64 -O0"
+	try_f90flags_noopt="-q64 -O0 -qfree=f90"
 	try_ldflags="-q64"
 	# try_ldflags_static="-bstatic"
 	pre_fdflags="-WF,"
@@ -2947,6 +2955,7 @@ mips:f90 )
 	try_fflags="-mips4 -64 -O2 -r10000 -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-mips4 -64 -O0"
+	try_f90flags_noopt="-mips4 -64 -O0"
 	try_ldflags="-mips4 -64"
 	pre_fdflags="-cpp "
 	have_cpp=1
@@ -2971,13 +2980,15 @@ sparc:mpf90 | sparc:f90 )
 -xlic_lib=sunperf"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 crayx1:ftn )
         try_fflags="-s default64 -dp -rma -e0 \
 -O scalar3,stream3,vector3,nointerchange -Z -O inline5"
         try_f90flags="\$(FFLAGS)"
-        try_fflags_noopt="FFLAGS = -s default64 -dp -rma -e0 -O0 -Z"
+        try_fflags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
+        try_f90flags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
         try_ldflags="-s default64 -f nan64"
         try_dflags="$try_dflags -D__X1_COA"
         pre_fdflags="-e Z -F"
@@ -2988,6 +2999,7 @@ mac:* )
 -qdpc -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	pre_fdflags="-WF,"
 	xlf_flags=1
@@ -2998,16 +3010,20 @@ mac:* )
 	try_fflags="-O"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 esac
 if test $no_shared ; then try_ldflags="$try_ldflags $try_ldflags_static" ; fi
 
-if test "$fflags" = ""       ; then fflags=$try_fflags             ; fi
-if test "$f90flags" = ""     ; then f90flags=$try_f90flags         ; fi
-if test "$fflags_noopt" = "" ; then fflags_noopt=$try_fflags_noopt ; fi
+if test "$fflags" = ""   ; then fflags=$try_fflags     ; fi
+if test "$f90flags" = "" ; then f90flags=$try_f90flags ; fi
+if test "$fflags_noopt" = ""   ; then fflags_noopt=$try_fflags_noopt     ; fi
+if test "$f90flags_noopt" = "" ; then f90flags_noopt=$try_f90flags_noopt ; fi
 echo setting FFLAGS... $fflags
 echo setting F90FLAGS... $f90flags
+echo setting FFLAGS_NOOPT... $fflags_noopt
+echo setting F90FLAGS_NOOPT... $f90flags_noopt
 
 case "$arch:$cc_id" in
 linux*:icc )
@@ -6144,6 +6160,7 @@ fi
 
 
 
+
 
 
                     ac_config_files="$ac_config_files make.sys make.rules"
@@ -6812,6 +6829,7 @@ s,@f90@,$f90,;t t
 s,@fflags@,$fflags,;t t
 s,@f90flags@,$f90flags,;t t
 s,@fflags_noopt@,$fflags_noopt,;t t
+s,@f90flags_noopt@,$f90flags_noopt,;t t
 s,@pre_fdflags@,$pre_fdflags,;t t
 s,@ifftw@,$ifftw,;t t
 s,@ld@,$ld,;t t
diff --git a/configure.ac b/configure.ac
index 55e9c3afe..94acaefef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,6 +325,7 @@ linux64:ifort )
 	try_fflags="-O2 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -335,6 +336,7 @@ linux64:ifc )
 	try_fflags="-Vaxlib -O2"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -345,6 +347,7 @@ linux64:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -353,6 +356,7 @@ linux32:ifort )
         try_fflags="-O2 -tpp6 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -363,6 +367,7 @@ linux32:ifc )
         try_fflags="-Vaxlib -O2 -tpp6"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -401,6 +406,7 @@ linux32:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -409,6 +415,7 @@ linux*:g95 )
 	try_fflags="-O3"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	#try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__G95"
@@ -418,6 +425,7 @@ aix:*xlf* )
 -qarch=auto -qtune=auto -qsuffix=cpp=f90 -qdpc -Q -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-q64 -O0"
+	try_f90flags_noopt="-q64 -O0 -qfree=f90"
 	try_ldflags="-q64"
 	# try_ldflags_static="-bstatic"
 	pre_fdflags="-WF,"
@@ -428,6 +436,7 @@ mips:f90 )
 	try_fflags="-mips4 -64 -O2 -r10000 -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-mips4 -64 -O0"
+	try_f90flags_noopt="-mips4 -64 -O0"
 	try_ldflags="-mips4 -64"
 	pre_fdflags="-cpp "
 	have_cpp=1
@@ -452,13 +461,15 @@ sparc:mpf90 | sparc:f90 )
 -xlic_lib=sunperf"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 crayx1:ftn )
         try_fflags="-s default64 -dp -rma -e0 \
 -O scalar3,stream3,vector3,nointerchange -Z -O inline5"
         try_f90flags="\$(FFLAGS)"
-        try_fflags_noopt="FFLAGS = -s default64 -dp -rma -e0 -O0 -Z"
+        try_fflags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
+        try_f90flags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
         try_ldflags="-s default64 -f nan64"
         try_dflags="$try_dflags -D__X1_COA"
         pre_fdflags="-e Z -F"
@@ -469,6 +480,7 @@ mac:* )
 -qdpc -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	pre_fdflags="-WF,"
 	xlf_flags=1
@@ -479,16 +491,20 @@ mac:* )
 	try_fflags="-O"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 esac
 if test $no_shared ; then try_ldflags="$try_ldflags $try_ldflags_static" ; fi
 
-if test "$fflags" = ""       ; then fflags=$try_fflags             ; fi
-if test "$f90flags" = ""     ; then f90flags=$try_f90flags         ; fi
-if test "$fflags_noopt" = "" ; then fflags_noopt=$try_fflags_noopt ; fi
+if test "$fflags" = ""   ; then fflags=$try_fflags     ; fi
+if test "$f90flags" = "" ; then f90flags=$try_f90flags ; fi
+if test "$fflags_noopt" = ""   ; then fflags_noopt=$try_fflags_noopt     ; fi
+if test "$f90flags_noopt" = "" ; then f90flags_noopt=$try_f90flags_noopt ; fi
 echo setting FFLAGS... $fflags
 echo setting F90FLAGS... $f90flags
+echo setting FFLAGS_NOOPT... $fflags_noopt
+echo setting F90FLAGS_NOOPT... $f90flags_noopt
 
 case "$arch:$cc_id" in
 linux*:icc )
@@ -1010,6 +1026,7 @@ AC_SUBST(f90)
 AC_SUBST(fflags)
 AC_SUBST(f90flags)
 AC_SUBST(fflags_noopt)
+AC_SUBST(f90flags_noopt)
 AC_SUBST(pre_fdflags)
 AC_SUBST(ifftw)
 AC_SUBST(ld)
diff --git a/install/configure b/install/configure
index c98dee0f5..8c516a25b 100755
--- a/install/configure
+++ b/install/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os F77 FFLAGS LDFLAGS ac_ct_F77 EXEEXT OBJEXT CC CFLAGS CPPFLAGS ac_ct_CC CPP SET_MAKE EGREP cc cflags dflags fdflags cpp cppflags f77 f90 fflags f90flags fflags_noopt pre_fdflags ifftw ld ldflags libs mylib ar arflags ranlib f90rule LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os F77 FFLAGS LDFLAGS ac_ct_F77 EXEEXT OBJEXT CC CFLAGS CPPFLAGS ac_ct_CC CPP SET_MAKE EGREP cc cflags dflags fdflags cpp cppflags f77 f90 fflags f90flags fflags_noopt f90flags_noopt pre_fdflags ifftw ld ldflags libs mylib ar arflags ranlib f90rule LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2844,6 +2844,7 @@ linux64:ifort )
 	try_fflags="-O2 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2854,6 +2855,7 @@ linux64:ifc )
 	try_fflags="-Vaxlib -O2"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2864,6 +2866,7 @@ linux64:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -2872,6 +2875,7 @@ linux32:ifort )
         try_fflags="-O2 -tpp6 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2882,6 +2886,7 @@ linux32:ifc )
         try_fflags="-Vaxlib -O2 -tpp6"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -2920,6 +2925,7 @@ linux32:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -2928,6 +2934,7 @@ linux*:g95 )
 	try_fflags="-O3"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	#try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__G95"
@@ -2937,6 +2944,7 @@ aix:*xlf* )
 -qarch=auto -qtune=auto -qsuffix=cpp=f90 -qdpc -Q -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-q64 -O0"
+	try_f90flags_noopt="-q64 -O0 -qfree=f90"
 	try_ldflags="-q64"
 	# try_ldflags_static="-bstatic"
 	pre_fdflags="-WF,"
@@ -2947,6 +2955,7 @@ mips:f90 )
 	try_fflags="-mips4 -64 -O2 -r10000 -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-mips4 -64 -O0"
+	try_f90flags_noopt="-mips4 -64 -O0"
 	try_ldflags="-mips4 -64"
 	pre_fdflags="-cpp "
 	have_cpp=1
@@ -2971,13 +2980,15 @@ sparc:mpf90 | sparc:f90 )
 -xlic_lib=sunperf"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 crayx1:ftn )
         try_fflags="-s default64 -dp -rma -e0 \
 -O scalar3,stream3,vector3,nointerchange -Z -O inline5"
         try_f90flags="\$(FFLAGS)"
-        try_fflags_noopt="FFLAGS = -s default64 -dp -rma -e0 -O0 -Z"
+        try_fflags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
+        try_f90flags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
         try_ldflags="-s default64 -f nan64"
         try_dflags="$try_dflags -D__X1_COA"
         pre_fdflags="-e Z -F"
@@ -2988,6 +2999,7 @@ mac:* )
 -qdpc -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	pre_fdflags="-WF,"
 	xlf_flags=1
@@ -2998,16 +3010,20 @@ mac:* )
 	try_fflags="-O"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 esac
 if test $no_shared ; then try_ldflags="$try_ldflags $try_ldflags_static" ; fi
 
-if test "$fflags" = ""       ; then fflags=$try_fflags             ; fi
-if test "$f90flags" = ""     ; then f90flags=$try_f90flags         ; fi
-if test "$fflags_noopt" = "" ; then fflags_noopt=$try_fflags_noopt ; fi
+if test "$fflags" = ""   ; then fflags=$try_fflags     ; fi
+if test "$f90flags" = "" ; then f90flags=$try_f90flags ; fi
+if test "$fflags_noopt" = ""   ; then fflags_noopt=$try_fflags_noopt     ; fi
+if test "$f90flags_noopt" = "" ; then f90flags_noopt=$try_f90flags_noopt ; fi
 echo setting FFLAGS... $fflags
 echo setting F90FLAGS... $f90flags
+echo setting FFLAGS_NOOPT... $fflags_noopt
+echo setting F90FLAGS_NOOPT... $f90flags_noopt
 
 case "$arch:$cc_id" in
 linux*:icc )
@@ -6144,6 +6160,7 @@ fi
 
 
 
+
 
 
                     ac_config_files="$ac_config_files make.sys make.rules"
@@ -6812,6 +6829,7 @@ s,@f90@,$f90,;t t
 s,@fflags@,$fflags,;t t
 s,@f90flags@,$f90flags,;t t
 s,@fflags_noopt@,$fflags_noopt,;t t
+s,@f90flags_noopt@,$f90flags_noopt,;t t
 s,@pre_fdflags@,$pre_fdflags,;t t
 s,@ifftw@,$ifftw,;t t
 s,@ld@,$ld,;t t
diff --git a/install/configure.ac b/install/configure.ac
index 55e9c3afe..94acaefef 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -325,6 +325,7 @@ linux64:ifort )
 	try_fflags="-O2 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -335,6 +336,7 @@ linux64:ifc )
 	try_fflags="-Vaxlib -O2"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -345,6 +347,7 @@ linux64:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -353,6 +356,7 @@ linux32:ifort )
         try_fflags="-O2 -tpp6 -assume byterecl"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -363,6 +367,7 @@ linux32:ifc )
         try_fflags="-Vaxlib -O2 -tpp6"
 	try_f90flags="\$(FFLAGS) -nomodule"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags="-Vaxlib"
 	try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__INTEL"
@@ -401,6 +406,7 @@ linux32:pgf* )
 	try_fflags="-fast -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	try_ldflags_static="-Bstatic"
 	try_dflags="$try_dflags -D__PGI"
@@ -409,6 +415,7 @@ linux*:g95 )
 	try_fflags="-O3"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	#try_ldflags_static="-static"
 	try_dflags="$try_dflags -D__G95"
@@ -418,6 +425,7 @@ aix:*xlf* )
 -qarch=auto -qtune=auto -qsuffix=cpp=f90 -qdpc -Q -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-q64 -O0"
+	try_f90flags_noopt="-q64 -O0 -qfree=f90"
 	try_ldflags="-q64"
 	# try_ldflags_static="-bstatic"
 	pre_fdflags="-WF,"
@@ -428,6 +436,7 @@ mips:f90 )
 	try_fflags="-mips4 -64 -O2 -r10000 -r8"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-mips4 -64 -O0"
+	try_f90flags_noopt="-mips4 -64 -O0"
 	try_ldflags="-mips4 -64"
 	pre_fdflags="-cpp "
 	have_cpp=1
@@ -452,13 +461,15 @@ sparc:mpf90 | sparc:f90 )
 -xlic_lib=sunperf"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 crayx1:ftn )
         try_fflags="-s default64 -dp -rma -e0 \
 -O scalar3,stream3,vector3,nointerchange -Z -O inline5"
         try_f90flags="\$(FFLAGS)"
-        try_fflags_noopt="FFLAGS = -s default64 -dp -rma -e0 -O0 -Z"
+        try_fflags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
+        try_f90flags_noopt="-s default64 -dp -rma -e0 -O0 -Z"
         try_ldflags="-s default64 -f nan64"
         try_dflags="$try_dflags -D__X1_COA"
         pre_fdflags="-e Z -F"
@@ -469,6 +480,7 @@ mac:* )
 -qdpc -qalias=nointptr"
 	try_f90flags="\$(FFLAGS) -qfree=f90"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	pre_fdflags="-WF,"
 	xlf_flags=1
@@ -479,16 +491,20 @@ mac:* )
 	try_fflags="-O"
 	try_f90flags="\$(FFLAGS)"
 	try_fflags_noopt="-O0"
+	try_f90flags_noopt="-O0"
 	try_ldflags=""
 	;;
 esac
 if test $no_shared ; then try_ldflags="$try_ldflags $try_ldflags_static" ; fi
 
-if test "$fflags" = ""       ; then fflags=$try_fflags             ; fi
-if test "$f90flags" = ""     ; then f90flags=$try_f90flags         ; fi
-if test "$fflags_noopt" = "" ; then fflags_noopt=$try_fflags_noopt ; fi
+if test "$fflags" = ""   ; then fflags=$try_fflags     ; fi
+if test "$f90flags" = "" ; then f90flags=$try_f90flags ; fi
+if test "$fflags_noopt" = ""   ; then fflags_noopt=$try_fflags_noopt     ; fi
+if test "$f90flags_noopt" = "" ; then f90flags_noopt=$try_f90flags_noopt ; fi
 echo setting FFLAGS... $fflags
 echo setting F90FLAGS... $f90flags
+echo setting FFLAGS_NOOPT... $fflags_noopt
+echo setting F90FLAGS_NOOPT... $f90flags_noopt
 
 case "$arch:$cc_id" in
 linux*:icc )
@@ -1010,6 +1026,7 @@ AC_SUBST(f90)
 AC_SUBST(fflags)
 AC_SUBST(f90flags)
 AC_SUBST(fflags_noopt)
+AC_SUBST(f90flags_noopt)
 AC_SUBST(pre_fdflags)
 AC_SUBST(ifftw)
 AC_SUBST(ld)
diff --git a/install/make.sys.in b/install/make.sys.in
index 05d3cf436..7c08ea438 100644
--- a/install/make.sys.in
+++ b/install/make.sys.in
@@ -15,6 +15,7 @@ FFLAGS         = @fflags@ $(IFLAGS)
 F77FLAGS       = $(FFLAGS)
 F90FLAGS       = @f90flags@ @pre_fdflags@$(FDFLAGS)
 F77FLAGS_NOOPT = @fflags_noopt@
+F90FLAGS_NOOPT = @f90flags_noopt@ @pre_fdflags@$(FDFLAGS)
 LD             = @ld@
 LDFLAGS        = @ldflags@ $(LIBOBJS) $(LIBS)
 LIBOBJS        = ../flib/ptools.a ../flib/flib.a ../clib/clib.a
diff --git a/make.sys.in b/make.sys.in
index 05d3cf436..7c08ea438 100644
--- a/make.sys.in
+++ b/make.sys.in
@@ -15,6 +15,7 @@ FFLAGS         = @fflags@ $(IFLAGS)
 F77FLAGS       = $(FFLAGS)
 F90FLAGS       = @f90flags@ @pre_fdflags@$(FDFLAGS)
 F77FLAGS_NOOPT = @fflags_noopt@
+F90FLAGS_NOOPT = @f90flags_noopt@ @pre_fdflags@$(FDFLAGS)
 LD             = @ld@
 LDFLAGS        = @ldflags@ $(LIBOBJS) $(LIBS)
 LIBOBJS        = ../flib/ptools.a ../flib/flib.a ../clib/clib.a