mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
[svn-r6680] Purpose:
Feature Add
Description:
Added a "libhdf5_fortran.settings" file to the Fortran library.
Platforms tested:
Arabica (Fortran)
Modi4 (Parallel & Fortran)
Vebena (Fortran & C++)
Misc. update:
This commit is contained in:
Bill Wendling
parent
28d2520341
commit
3935629cd6
1
MANIFEST
1
MANIFEST
@ -624,6 +624,7 @@
|
||||
./fortran/src/Makefile.in
|
||||
./fortran/src/README
|
||||
./fortran/src/h5fc.in
|
||||
./fortran/src/libhdf5_fortran.settings.in
|
||||
|
||||
./fortran/test/Dependencies
|
||||
./fortran/test/Makefile.in
|
||||
|
||||
@ -74,8 +74,8 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir)
|
||||
((cp *.$(F9XMODEXT) $(libdir)/. && chmod 644 $(libdir)/*.$(F9XMODEXT)) || exit 1); \
|
||||
fi; \
|
||||
fi
|
||||
@if test -f libhdf5.fortran.settings; then \
|
||||
(set -x; $(INSTALL_DATA) libhdf5.fortran.settings $(libdir)/. || exit 1); \
|
||||
@if test -f libhdf5_fortran.settings; then \
|
||||
(set -x; $(INSTALL_DATA) libhdf5_fortran.settings $(libdir)/. || exit 1); \
|
||||
fi
|
||||
@for f in X $(PUB_HDR); do \
|
||||
if test $$f != X; then \
|
||||
@ -107,7 +107,7 @@ uninstall-examples:
|
||||
|
||||
## Removes those things that `make install' (would have) installed.
|
||||
uninstall:
|
||||
@for f in libhdf5.fortran.settings $(LIB); do \
|
||||
@for f in libhdf5_fortran.settings $(LIB); do \
|
||||
$(LT_UNINSTALL) $(libdir)/$$f; \
|
||||
done
|
||||
@if test -n "$(PUB_HDR)"; then \
|
||||
|
||||
61
fortran/configure
vendored
61
fortran/configure
vendored
@ -9240,6 +9240,57 @@ fi
|
||||
|
||||
rm -f conftest core core.* *.core conftest.o conftest.c dummy.o $ac_clean_files
|
||||
|
||||
|
||||
H5_VERSION="`cut -d' ' -f3 $srcdir/README.txt | head -1`"
|
||||
|
||||
|
||||
CONFIG_DATE="`date`"
|
||||
|
||||
CONFIG_USER="`whoami`@`hostname`"
|
||||
if test -n "$ORGANIZATION"; then
|
||||
CONFIG_USER="$CONFIG_USER at $ORGANIZATION"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
if test "X$ac_cv_c_bigendian" = "Xyes"; then
|
||||
BYTESEX="big-endian"
|
||||
else
|
||||
BYTESEX="little-endian"
|
||||
fi
|
||||
|
||||
PARALLEL=${PARALLEL:-no}
|
||||
|
||||
|
||||
if `echo $CC | grep / 2>&1 /dev/null`; then
|
||||
CC_VERSION="$CC"
|
||||
else
|
||||
CC_VERSION="$CC";
|
||||
for x in `echo $PATH | sed -e 's/:/ /g'`; do
|
||||
if test -x $x/$CC; then
|
||||
CC_VERSION="$x/$CC"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if test -n "$cc_vendor" && test -n "$cc_version"; then
|
||||
CC_VERSION="$CC_VERSION ($cc_vendor-$cc_version)"
|
||||
fi
|
||||
|
||||
|
||||
if `echo $F9X | grep / 2>&1 /dev/null`; then
|
||||
FC_VERSION="$F9X"
|
||||
else
|
||||
FC_VERSION="$F9X";
|
||||
for x in `echo $PATH | sed -e 's/:/ /g'`; do
|
||||
if test -x $x/$F9X; then
|
||||
FC_VERSION="$x/$F9X"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
DYNAMIC_DIRS=""
|
||||
if test -n "$LDFLAGS"; then
|
||||
for d in $LDFLAGS ; do
|
||||
@ -9286,7 +9337,7 @@ fi
|
||||
|
||||
saved_no_create=$no_create
|
||||
no_create=yes
|
||||
ac_config_files="$ac_config_files config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/h5fc src/H5fortran_types.f90 src/Makefile test/Makefile $PARALLEL_MAKE examples/Makefile"
|
||||
ac_config_files="$ac_config_files config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/h5fc src/H5fortran_types.f90 src/libhdf5_fortran.settings src/Makefile test/Makefile $PARALLEL_MAKE examples/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -9779,6 +9830,7 @@ do
|
||||
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"src/h5fc" ) CONFIG_FILES="$CONFIG_FILES src/h5fc" ;;
|
||||
"src/H5fortran_types.f90" ) CONFIG_FILES="$CONFIG_FILES src/H5fortran_types.f90" ;;
|
||||
"src/libhdf5_fortran.settings" ) CONFIG_FILES="$CONFIG_FILES src/libhdf5_fortran.settings" ;;
|
||||
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
||||
"test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
|
||||
"$PARALLEL_MAKE" ) CONFIG_FILES="$CONFIG_FILES $PARALLEL_MAKE" ;;
|
||||
@ -9917,6 +9969,13 @@ s,@FILTERS@,$FILTERS,;t t
|
||||
s,@ADD_PARALLEL_FILES@,$ADD_PARALLEL_FILES,;t t
|
||||
/@DEPEND@/r $DEPEND
|
||||
s,@DEPEND@,,;t t
|
||||
s,@H5_VERSION@,$H5_VERSION,;t t
|
||||
s,@CONFIG_DATE@,$CONFIG_DATE,;t t
|
||||
s,@CONFIG_USER@,$CONFIG_USER,;t t
|
||||
s,@CONFIG_MODE@,$CONFIG_MODE,;t t
|
||||
s,@BYTESEX@,$BYTESEX,;t t
|
||||
s,@CC_VERSION@,$CC_VERSION,;t t
|
||||
s,@FC_VERSION@,$FC_VERSION,;t t
|
||||
s,@DYNAMIC_DIRS@,$DYNAMIC_DIRS,;t t
|
||||
/@COMMENCE@/r $COMMENCE
|
||||
s,@COMMENCE@,,;t t
|
||||
|
||||
@ -905,6 +905,69 @@ fi
|
||||
dnl Some cleanup stuff
|
||||
rm -f conftest core core.* *.core conftest.o conftest.c dummy.o $ac_clean_files
|
||||
|
||||
dnl ----------------------------------------------------------------------
|
||||
dnl Set some variables for general configuration information to be saved
|
||||
dnl and installed with the libraries.
|
||||
dnl
|
||||
|
||||
dnl HDF5 version from the first line of the README.txt file.
|
||||
H5_VERSION="`cut -d' ' -f3 $srcdir/README.txt | head -1`"
|
||||
AC_SUBST(H5_VERSION)
|
||||
|
||||
dnl Configuration date
|
||||
AC_SUBST(CONFIG_DATE) CONFIG_DATE="`date`"
|
||||
|
||||
dnl User doing the configuration
|
||||
AC_SUBST(CONFIG_USER) CONFIG_USER="`whoami`@`hostname`"
|
||||
if test -n "$ORGANIZATION"; then
|
||||
CONFIG_USER="$CONFIG_USER at $ORGANIZATION"
|
||||
fi
|
||||
|
||||
dnl Configuration mode (production, development, profile, etc) saved above.
|
||||
AC_SUBST(CONFIG_MODE)
|
||||
|
||||
dnl Byte sex from the AC_C_BIGENDIAN macro.
|
||||
AC_SUBST(BYTESEX)
|
||||
if test "X$ac_cv_c_bigendian" = "Xyes"; then
|
||||
BYTESEX="big-endian"
|
||||
else
|
||||
BYTESEX="little-endian"
|
||||
fi
|
||||
|
||||
dnl Parallel support? (set above except empty if none)
|
||||
PARALLEL=${PARALLEL:-no}
|
||||
|
||||
dnl Compiler with version information. This consists of the full path
|
||||
dnl name of the compiler and the reported version number.
|
||||
AC_SUBST(CC_VERSION)
|
||||
if `echo $CC | grep / 2>&1 /dev/null`; then
|
||||
CC_VERSION="$CC"
|
||||
else
|
||||
CC_VERSION="$CC";
|
||||
for x in `echo $PATH | sed -e 's/:/ /g'`; do
|
||||
if test -x $x/$CC; then
|
||||
CC_VERSION="$x/$CC"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if test -n "$cc_vendor" && test -n "$cc_version"; then
|
||||
CC_VERSION="$CC_VERSION ($cc_vendor-$cc_version)"
|
||||
fi
|
||||
|
||||
AC_SUBST(FC_VERSION)
|
||||
if `echo $F9X | grep / 2>&1 /dev/null`; then
|
||||
FC_VERSION="$F9X"
|
||||
else
|
||||
FC_VERSION="$F9X";
|
||||
for x in `echo $PATH | sed -e 's/:/ /g'`; do
|
||||
if test -x $x/$F9X; then
|
||||
FC_VERSION="$x/$F9X"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------------
|
||||
dnl Determine the runtime libraries we may need to include in the
|
||||
dnl libtools command so that executables will find the correct dynamic
|
||||
@ -983,6 +1046,7 @@ AC_CONFIG_FILES([config/depend1
|
||||
Makefile
|
||||
src/h5fc
|
||||
src/H5fortran_types.f90
|
||||
src/libhdf5_fortran.settings
|
||||
src/Makefile
|
||||
test/Makefile
|
||||
$PARALLEL_MAKE
|
||||
|
||||
@ -28,6 +28,7 @@ CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
|
||||
|
||||
## This is our main target
|
||||
LIB=libhdf5_fortran.la
|
||||
CLEAN=libhdf5_fortran.settings
|
||||
DISTCLEAN=H5fortran_types.f90
|
||||
|
||||
## Public header files (to be installed)...
|
||||
@ -41,12 +42,12 @@ FPAR_MOD=${ADD_PARALLEL_FILES:yes=HDF5mpio.f90}
|
||||
|
||||
CPARALLEL=${ADD_PARALLEL_FILES:yes=H5FDmpiof.c}
|
||||
CLIB_SRC=H5f90kit.c H5_f.c H5Git.c H5Rf.c H5Ff.c H5Sf.c H5Df.c H5Gf.c \
|
||||
H5Af.c H5Tf.c H5Pf.c H5If.c H5Ef.c H5Zf.c ${CPARALLEL:no=}
|
||||
H5Af.c H5Tf.c H5Pf.c H5If.c H5Ef.c H5Zf.c ${CPARALLEL:no=}
|
||||
|
||||
FPARALLEL=${ADD_PARALLEL_FILES:yes=H5FDmpioff.f90}
|
||||
FLIB_SRC=H5fortran_types.f90 H5fortran_flags.f90 H5f90global.f90 H5_ff.f90 \
|
||||
H5Rff.f90 H5Fff.f90 H5Sff.f90 H5Dff.f90 H5Gff.f90 H5Aff.f90 H5Tff.f90 \
|
||||
H5Pff.f90 H5Iff.f90 H5Eff.f90 H5Zff.f90 ${FPARALLEL:no=} ${FPAR_MOD:no=HDF5.f90}
|
||||
H5Pff.f90 H5Iff.f90 H5Eff.f90 H5Zff.f90 ${FPARALLEL:no=} ${FPAR_MOD:no=HDF5.f90}
|
||||
|
||||
LIB_SRC=$(CLIB_SRC) $(FLIB_SRC)
|
||||
LIB_OBJ=$(CLIB_SRC:.c=.lo) $(FLIB_SRC:.f90=.lo)
|
||||
|
||||
18
fortran/src/libhdf5_fortran.settings.in
Normal file
18
fortran/src/libhdf5_fortran.settings.in
Normal file
@ -0,0 +1,18 @@
|
||||
SUMMARY OF THE HDF5 CONFIGURATION
|
||||
=================================
|
||||
|
||||
HDF5 Version: @H5_VERSION@
|
||||
Configured on: @CONFIG_DATE@
|
||||
Configured by: @CONFIG_USER@
|
||||
Configure mode: @CONFIG_MODE@
|
||||
Host system: @host_cpu@-@host_vendor@-@host_os@
|
||||
Byte sex: @BYTESEX@
|
||||
Parallel support: @PARALLEL@
|
||||
Installation point: @prefix@
|
||||
C Compiler: @CC_VERSION@
|
||||
C Flags: @CFLAGS@ @CPPFLAGS@
|
||||
Extra C libraries: @LDFLAGS@ @LIBS@
|
||||
Fortran Compiler: @FC_VERSION@
|
||||
Fortran Flags: @FFLAGS@
|
||||
Archiver: @AR@
|
||||
Ranlib: @RANLIB@
|
||||
Loading…
x
Reference in New Issue
Block a user