diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-05-28 16:53:15 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-05-28 16:53:15 (GMT) |
| commit | 52e5579fbae41ee79f91eaeb66d452e8b1cc9e09 (patch) | |
| tree | 0d3fa5ff4f7a4e89b9f469de821377f2fa8482f7 | |
| parent | 0560c11c20476a8c99316bd88f1b6924afa057f9 (diff) | |
| download | hdf5-52e5579fbae41ee79f91eaeb66d452e8b1cc9e09.zip hdf5-52e5579fbae41ee79f91eaeb66d452e8b1cc9e09.tar.gz hdf5-52e5579fbae41ee79f91eaeb66d452e8b1cc9e09.tar.bz2 | |
[svn-r27122] removed dependency on generatored fortran source code
47 files changed, 24 insertions, 66 deletions
diff --git a/Makefile.in b/Makefile.in index 65115ad..0e1d3e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -305,7 +305,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/Makefile.in b/c++/Makefile.in index d4bc007..42b0f4d 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -465,7 +465,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index abbd25e..5568998 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -413,7 +413,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 94726b0..5cd59e6 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -476,7 +476,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 4e616cd..cf04ba0 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -467,7 +467,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ @@ -771,7 +771,6 @@ enable_shared STATIC_SHARED THREADSAFE DIRECT_VFD -HAVE_FLOAT128 HAVE_DMALLOC CODESTACK INSTRUMENT @@ -3876,7 +3875,6 @@ $as_echo "done" >&6; } CODESTACK=no HAVE_DMALLOC=no - HAVE_FLOAT128=no DIRECT_VFD=no THREADSAFE=no @@ -7053,7 +7051,7 @@ else ENDIF IF (k .LE. 0) EXIT ENDDO - IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " + IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " END @@ -7209,7 +7207,7 @@ else ENDIF IF (k .LE. 0) EXIT ENDDO - IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " + IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " END @@ -24712,7 +24710,6 @@ fi rm -f confcache ## Check for the __FLOAT128 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __float128" >&5 $as_echo_n "checking for __float128... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 9dde1f5..f5eff26 100644 --- a/configure.ac +++ b/configure.ac @@ -175,7 +175,6 @@ AC_SUBST([HDF5_HL]) HDF5_HL=yes AC_SUBST([INSTRUMENT]) AC_SUBST([CODESTACK]) CODESTACK=no AC_SUBST([HAVE_DMALLOC]) HAVE_DMALLOC=no -AC_SUBST([HAVE_FLOAT128]) HAVE_FLOAT128=no AC_SUBST([DIRECT_VFD]) DIRECT_VFD=no AC_SUBST([THREADSAFE]) THREADSAFE=no AC_SUBST([STATIC_SHARED]) @@ -1108,12 +1107,10 @@ AC_CHECK_SIZEOF([off64_t], [8]) AC_CACHE_SAVE ## Check for the __FLOAT128 - AC_MSG_CHECKING([for __float128]) AC_TRY_COMPILE([], [__float128 x;], - [AC_DEFINE([HAVE_FLOAT128], [1], - [__float128 is available]) + [AC_DEFINE([HAVE_FLOAT128], [1], [Determine if __float128 is available]) AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]) ) diff --git a/examples/Makefile.in b/examples/Makefile.in index ac7f3e2..90fb879 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -413,7 +413,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 253302f..3cc4f13 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -469,7 +469,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index dc1de56..c9b7586 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -413,7 +413,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c index 35dbc19..2067f60 100644 --- a/fortran/src/H5match_types.c +++ b/fortran/src/H5match_types.c @@ -206,15 +206,19 @@ int main(void) /* (b) Define c_float_x */ + /* make sure we find long double first before checking for __float128 + * ideally we need to match precision instead of matching sizeof */ + + int found_longdb = 0; for(i=0;i< H5_FORTRAN_NUM_REAL_KINDS;i++) { -#ifdef HAVE_FLOAT128 -/* should fail */ - if(sizeof(__float128) == RealKinds_SizeOf[i]) { +#ifdef H5_HAVE_FLOAT128 + if(sizeof(__float128) == RealKinds_SizeOf[i] && found_longdb == 1) { writeTypedef("float", "__float128", RealKinds[i]); strcpy(Real_C_TYPES[i], "C_FLOAT128"); } else #endif if(sizeof(long double) == RealKinds_SizeOf[i]) { + found_longdb = 1; writeTypedef("float", "long double", RealKinds[i]); strcpy(Real_C_TYPES[i], "C_LONG_DOUBLE"); } else if(sizeof(double) == RealKinds_SizeOf[i]) { diff --git a/fortran/src/H5test_kind.F90 b/fortran/src/H5test_kind.F90 index 7c5a6d6..018e603 100644 --- a/fortran/src/H5test_kind.F90 +++ b/fortran/src/H5test_kind.F90 @@ -117,6 +117,8 @@ PROGRAM test_kind ENDIF ENDDO + GOTO 10 + ! Generate program information: WRITE(*,'(40(A,/))') & @@ -312,6 +314,7 @@ WRITE(*,'(40(A,/))') & WRITE(*,*) "END PROGRAM H5test_kind" +10 CONTINUE ! (c) Generate Fortran H5* interfaces having multiple KIND interfaces. ! diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 43a5f3f..d2e06f8 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -60,8 +60,7 @@ DISTCLEANFILES=h5fc # H5fortran_types.F90 and H5f90i.h are automatically generaed by # H5match_types, and must be cleaned explicitly. H5fort_type_defines.h # is generated by H5fortran_detect -MOSTLYCLEANFILES=H5fortran_types.F90 H5f90i_gen.h H5fort_type_defines.h \ - H5fortran_detect.F90 +MOSTLYCLEANFILES=H5fortran_types.F90 H5f90i_gen.h H5fort_type_defines.h # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules @@ -138,11 +137,11 @@ H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT) # files. #H5fortran_detect_SOURCES = H5fortran_detect.F90 -# H5test_kind.F90 generates H5Fortran_detect.F90 depending on if -# intrinsic function SIZEOF is available. +# H5test_kind.F90 generates all the APIs that have a KIND type associated +# with them. H5_KINDff.F90: H5test_kind$(EXEEXT) - $(RUNSERIAL) ./H5test_kind$(EXEEXT) > H5fortran_detect.F90 + $(RUNSERIAL) ./H5test_kind$(EXEEXT) # H5test_kind.F90 is included in the distribution, and Automake knows # how to compile a fortran program given its sources. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 1de8d8a..43cc686 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -514,7 +514,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ @@ -746,9 +745,7 @@ DISTCLEANFILES = h5fc # H5fortran_types.F90 and H5f90i.h are automatically generaed by # H5match_types, and must be cleaned explicitly. H5fort_type_defines.h # is generated by H5fortran_detect -MOSTLYCLEANFILES = H5fortran_types.F90 H5f90i_gen.h H5fort_type_defines.h \ - H5fortran_detect.F90 - +MOSTLYCLEANFILES = H5fortran_types.F90 H5f90i_gen.h H5fort_type_defines.h @BUILD_PARALLEL_CONDITIONAL_FALSE@H5FC_NAME = h5fc # Custom rule for installing h5fc, since it will be named h5pfc if hdf5 @@ -1399,11 +1396,11 @@ H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT) # files. #H5fortran_detect_SOURCES = H5fortran_detect.F90 -# H5test_kind.F90 generates H5Fortran_detect.F90 depending on if -# intrinsic function SIZEOF is available. +# H5test_kind.F90 generates all the APIs that have a KIND type associated +# with them. H5_KINDff.F90: H5test_kind$(EXEEXT) - $(RUNSERIAL) ./H5test_kind$(EXEEXT) > H5fortran_detect.F90 + $(RUNSERIAL) ./H5test_kind$(EXEEXT) # Hardcode the dependencies of these files. There isn't a known way of # determining this automagically (like we do with the C files). So, when diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 866e28c..be0d503 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -525,7 +525,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 6b2269b..20eb895 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -465,7 +465,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 8e47cce..e3c6e4c 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -469,7 +469,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 5458d35..1149d55 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -465,7 +465,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 76570bc..f41c41d 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -412,7 +412,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 6440a63..83ea19c 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -468,7 +468,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 10ba6fb..4a7c181 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -465,7 +465,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index b9b7f68..eebefb1 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -412,7 +412,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 3380d01..b99b8fe 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -469,7 +469,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index feb1864..38b0581 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -412,7 +412,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index fb3e161..0fecd04 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -489,7 +489,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 2c75fa5..82e1f0d 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -477,7 +477,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 33d040f..7ca596a 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -467,7 +467,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 074ed79..776cc84 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -504,7 +504,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 42b09c6..e899e77 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -466,7 +466,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index b26df4b..fc4f5f0 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -480,7 +480,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4 index c8db176..d2eef67 100644 --- a/m4/aclocal_fc.m4 +++ b/m4/aclocal_fc.m4 @@ -321,8 +321,8 @@ AC_RUN_IFELSE([ ENDIF IF (k .LE. 0) EXIT ENDDO - dnl WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " - IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " + IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " + dnl IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " END ]) diff --git a/src/H5config.h.in b/src/H5config.h.in index a5083a8..61ca128 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -97,7 +97,7 @@ /* Define if support for szip filter is enabled */ #undef HAVE_FILTER_SZIP -/* __float128 is available */ +/* Determine if __float128 is available */ #undef HAVE_FLOAT128 /* Define to 1 if you have the `fork' function. */ diff --git a/src/Makefile.in b/src/Makefile.in index 4559f12..aa42511 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -528,7 +528,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/test/Makefile.in b/test/Makefile.in index 9e0e615..2cd3f90 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -872,7 +872,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index d1329b9..91d1ec0 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -495,7 +495,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 7160874..2c355f0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -466,7 +466,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 760cf07..ddb3e17 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -474,7 +474,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 2e0dd0c..8eb19cc 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -481,7 +481,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 0d6f10b..f615ca0 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -480,7 +480,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 8ce37dd..d93c9b6 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -474,7 +474,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 01b3784..06c0f16 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -486,7 +486,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 303065c..8735c09 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -466,7 +466,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 7c35da7..f1f1add 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -498,7 +498,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 524d8d7..7a0efb1 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -476,7 +476,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 6df09d7..1c23ced 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -463,7 +463,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index c5d1f37..ce2ce0c 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -501,7 +501,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in index 8fa1eda..40c9d63 100644 --- a/tools/perform/Makefile.in +++ b/tools/perform/Makefile.in @@ -505,7 +505,6 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FLOAT128 = @HAVE_FLOAT128@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ |