summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-10-13 21:55:21 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-10-13 21:55:21 (GMT)
commit4463d9b84c08cabe2033edd44d407eeab780fb82 (patch)
tree9b045e51e322ef410db600ecb2e4e095665c984b /config
parent93bea90f586a30e334ae8191a1413d906c76ddde (diff)
downloadhdf5-4463d9b84c08cabe2033edd44d407eeab780fb82.zip
hdf5-4463d9b84c08cabe2033edd44d407eeab780fb82.tar.gz
hdf5-4463d9b84c08cabe2033edd44d407eeab780fb82.tar.bz2
[svn-r17639] Purpose:
Configure Fix Description: uP (AIX Machine) was failing because configure needs to see -k flag in FCFLAGS for some checks to behave as intended. Since the config files were switched to passing all flags into H5_FCCFLAGS, this broke this behavior. To allow configure to see this again, FCFLAGS and all other user flags are saved before doing anything, and restored at the end of configure, so if needed we can set these values in configure and/or the config/ files without (permanently) overriding or changing anything a user sets. Also modified the powerpc-ibm-aix5.x config file to once again put -k into FCFLAGS in addition to H5_FCFLAGS (the former of which will be restored after configure completes the checks). Tested: h5committest (jam and amani finished, linew still running, though I wanted to get this in for daily tests since it needs to be run on uP for final verification).
Diffstat (limited to 'config')
-rw-r--r--config/powerpc-ibm-aix5.x6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 5659728..7b88d40 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -134,8 +134,14 @@ if test "X-" = "X-$FC"; then
fi
fi
+# While we try to avoid setting FCFLAGS directly for use in compilation, in
+# this case we need the -k flag present for some configure checks. As such,
+# the configure script saves the user's set FCFLAGS before running, and
+# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS
+# to ensure the flag is present for both configure as well as for the build.
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG="-qsuffix=f=f90"
+ FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
H5_FCFLAGS="$H5_FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
FSEARCH_DIRS="-I./ -I../src"
DEBUG_FCFLAGS="-O"