diff options
author | James Laird <jlaird@hdfgroup.org> | 2005-03-07 17:57:27 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2005-03-07 17:57:27 (GMT) |
commit | 25df1908bc0430994cecc9f1415838f42fe0c816 (patch) | |
tree | bce2777e087cc7d547e7b644f908eff72282bb53 /config/powerpc-apple | |
parent | 630b2901c53c66c837e39babe9da0c20020e5d4d (diff) | |
download | hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.zip hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.tar.gz hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.tar.bz2 |
[svn-r10158] Purpose:
Automake version upgrade
Description:
Upgraded automake version from 1.6.2 to 1.9.5.
Changed bin/reconfigure script to use automake 1.9.5.
Changed configure.in and Makefiles to use new FCFLAGS and FC variables
instead of FFLAGS and F9X.
Automake and configure should now do the lion's share of the work
supporting Fortran 9X; macros in acsite.m4 are now mostly unused (will
be cleaned later).
Altered how configure handles pmake; now root-level Makefile.in is
processed by bin/reconfigure to have a .MAKEFLAGS target, since
automake no longer allows us to define unused variables.
Configure now always checks for C++ compiler even if it is not
used, since automake thinks this is the Right Thing To Do and
will break otherwise.
Platforms tested:
Sol, copper, heping, mir, sleipnir, eirene, pommier, kelgia, modi4.
Diffstat (limited to 'config/powerpc-apple')
-rw-r--r-- | config/powerpc-apple | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config/powerpc-apple b/config/powerpc-apple index 1ea17c8..243f8ed 100644 --- a/config/powerpc-apple +++ b/config/powerpc-apple @@ -15,12 +15,12 @@ fi . $srcdir/config/gnu-flags # The default Fortran 90 compiler -if test "X-" = "X-$F9X"; then +if test "X-" = "X-$FC"; then # Assume Absoft compiler - F9X=xlf - F9X_BASENAME=xlf + FC=xlf + FC_BASENAME=xlf else - F9X_BASENAME=f95 + FC_BASENAME=f95 fi @@ -41,14 +41,14 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)' SIZE_T='SELECTED_INT_KIND(R_INTEGER)' OBJECT_NAMELEN_DEFAULT_F=-1 -case $F9X_BASENAME in +case $FC_BASENAME in xlf) F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90" - FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ " + FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ " FSEARCH_DIRS="-I./ -I../src" - DEBUG_FFLAGS="-g" - PROD_FFLAGS="-O" - PROFILE_FFLAGS="-g" + DEBUG_FCFLAGS="-g" + PROD_FCFLAGS="-O" + PROFILE_FCFLAGS="-g" f9x_flags_set=yes ;; @@ -59,11 +59,11 @@ case $F9X_BASENAME in F9XSUFFIXFLAG="" # We force compiler to use upper case for external names # (just in case since this should be a default EIP) - FFLAGS="$FFLAGS -YEXT_NAMES=UCS" + FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS" FSEARCH_DIRS="" - DEBUG_FFLAGS="-g" - PROD_FFLAGS="-O" - PROFILE_FFLAGS="-g -pg" + DEBUG_FCFLAGS="-g" + PROD_FCFLAGS="-O" + PROFILE_FCFLAGS="-g -pg" f9x_flags_set=yes ;; |