From 2dfde3e4fccc6e5b2f9627af688d347693d2ecef Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 3 Jul 2007 12:20:44 -0500 Subject: [svn-r13934] Description: Rename Mac OS X compiler configuration file to more generic name, which should allow Intel Macs to configure better. Tested on: Mac OS X/32 10.4.10 (amazon) --- MANIFEST | 2 +- config/apple | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ config/powerpc-apple | 81 ---------------------------------------------------- 3 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 config/apple delete mode 100644 config/powerpc-apple diff --git a/MANIFEST b/MANIFEST index e4140a3..cdf138a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -73,6 +73,7 @@ ./config/COPYING ./config/BlankForm +./config/apple ./config/commence.am ./config/conclude.am ./config/craynv @@ -103,7 +104,6 @@ ./config/Makefile.am.blank ./config/pgi-fflags ./config/pgi-flags -./config/powerpc-apple ./config/powerpc-ibm-aix4.x ./config/powerpc-ibm-aix5.x ./config/rs6000-ibm-aix4.x diff --git a/config/apple b/config/apple new file mode 100644 index 0000000..14504bb --- /dev/null +++ b/config/apple @@ -0,0 +1,81 @@ +# -*- shell-script -*- +# +# Copyright by The HDF Group. +# Copyright by the Board of Trustees of the University of Illinois. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF5 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. + + +# This file is part of the HDF5 build script. It is processed shortly +# after configure starts and defines, among other things, flags for +# the various compile modes. +# +# See BlankForm in this directory for details. + +# The default compiler is `gcc' +if test "X-" = "X-$CC"; then + CC=gcc + CC_BASENAME=gcc +fi + +# Figure out compiler flags +. $srcdir/config/gnu-flags + +# The default Fortran 90 compiler +if test "X-" = "X-$FC"; then + # Assume Absoft compiler + FC=xlf + FC_BASENAME=xlf + else + + # Neither xlf nor f95 have a working "version" command. + # If FC is set, try to guess which one is being used by examining + # the last element in the path to the compiler. + + TEMP_BASENAME=`basename $FC` + if test "xlf" = "${TEMP_BASENAME}"; then + FC_BASENAME=xlf + else + FC_BASENAME=f95 + fi +fi + +case $FC_BASENAME in + xlf) + F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90" + FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG}" + H5_FCFLAGS="$H5_FCFLAGS -qmoddir=./ " + FSEARCH_DIRS="-I./ -I../src" + DEBUG_FCFLAGS="-g" + PROD_FCFLAGS="-O" + PROFILE_FCFLAGS="-g" + f9x_flags_set=yes + ;; + + f95) + + F9XSUFFIXFLAG="" +# We force compiler to use upper case for external names +# (just in case since this should be a default EIP) + H5_FCFLAGS="$H5_FCFLAGS" + FSEARCH_DIRS="" + DEBUG_FCFLAGS="-g" + PROD_FCFLAGS="-O" + PROFILE_FCFLAGS="-g -pg" + f9x_flags_set=yes + +# f95 doesn't support shared libraries + echo ' warning: shared libraries are not supported for f95!' + echo ' disabling shared libraries' + enable_shared="no" + ;; + +esac diff --git a/config/powerpc-apple b/config/powerpc-apple deleted file mode 100644 index 14504bb..0000000 --- a/config/powerpc-apple +++ /dev/null @@ -1,81 +0,0 @@ -# -*- shell-script -*- -# -# Copyright by The HDF Group. -# Copyright by the Board of Trustees of the University of Illinois. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the files COPYING and Copyright.html. COPYING can be found at the root -# of the source code distribution tree; Copyright.html can be found at the -# root level of an installed copy of the electronic HDF5 document set and -# is linked from the top-level documents page. It can also be found at -# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from help@hdfgroup.org. - - -# This file is part of the HDF5 build script. It is processed shortly -# after configure starts and defines, among other things, flags for -# the various compile modes. -# -# See BlankForm in this directory for details. - -# The default compiler is `gcc' -if test "X-" = "X-$CC"; then - CC=gcc - CC_BASENAME=gcc -fi - -# Figure out compiler flags -. $srcdir/config/gnu-flags - -# The default Fortran 90 compiler -if test "X-" = "X-$FC"; then - # Assume Absoft compiler - FC=xlf - FC_BASENAME=xlf - else - - # Neither xlf nor f95 have a working "version" command. - # If FC is set, try to guess which one is being used by examining - # the last element in the path to the compiler. - - TEMP_BASENAME=`basename $FC` - if test "xlf" = "${TEMP_BASENAME}"; then - FC_BASENAME=xlf - else - FC_BASENAME=f95 - fi -fi - -case $FC_BASENAME in - xlf) - F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90" - FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG}" - H5_FCFLAGS="$H5_FCFLAGS -qmoddir=./ " - FSEARCH_DIRS="-I./ -I../src" - DEBUG_FCFLAGS="-g" - PROD_FCFLAGS="-O" - PROFILE_FCFLAGS="-g" - f9x_flags_set=yes - ;; - - f95) - - F9XSUFFIXFLAG="" -# We force compiler to use upper case for external names -# (just in case since this should be a default EIP) - H5_FCFLAGS="$H5_FCFLAGS" - FSEARCH_DIRS="" - DEBUG_FCFLAGS="-g" - PROD_FCFLAGS="-O" - PROFILE_FCFLAGS="-g -pg" - f9x_flags_set=yes - -# f95 doesn't support shared libraries - echo ' warning: shared libraries are not supported for f95!' - echo ' disabling shared libraries' - enable_shared="no" - ;; - -esac -- cgit v0.12