diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-07-17 16:10:46 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-07-17 16:10:46 (GMT) |
| commit | ceba60418cdeb53eae7d953ec6fc9cc1f58efff1 (patch) | |
| tree | dff97a1ffc292f5b479871b9c1c82106f30db0e5 /src | |
| parent | 23670c0cf63d08c4f78ea3e8f157bf58aab92b5a (diff) | |
| download | hdf5-ceba60418cdeb53eae7d953ec6fc9cc1f58efff1.zip hdf5-ceba60418cdeb53eae7d953ec6fc9cc1f58efff1.tar.gz hdf5-ceba60418cdeb53eae7d953ec6fc9cc1f58efff1.tar.bz2 | |
[svn-r5807] Purpose:
Update, Bug Fix, and Feature Add
Description:
- Updated how AC_{ENABLE,WITH} help messages were being generated.
Autoconf now gives you an AC_HELP_STRING macro to use to create
them.
- Fixed the problem with Linux LFS on RedHat 7.3 machines. It wasn't
finding getdents64(), so we can't rely on that being present
anymore...
- Added GPFS detection and setting.
- Updated how compression is specified. It's no longer necessary to
test for HAVE_ZLIB_H, HAVE_LIBZ, and HAVE_COMPRESS2. The one macro
{H5_}HAVE_COMPRESSION takes care of all of these.
Solution:
Changed the check for Linux LFS from looking for getdents() to
looking at the version number of the kernel (using the uname -r
command). You can still override with the --enable-linux-lfs switch
if you really believe that your <2.4 kernel has LFS support.
Platforms tested:
Linux (2.2 and 2.4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Zdeflate.c | 8 | ||||
| -rw-r--r-- | src/H5config.h.in | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 43ffbd5..1910115 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -14,7 +14,7 @@ # include "zlib.h" #else /* Make sure compression is disabled too. */ -#undef H5_HAVE_COMPRESS2 +#undef H5_HAVE_COMPRESSION #endif /* Interface initialization */ @@ -40,7 +40,7 @@ static int interface_initialize_g = 0; *------------------------------------------------------------------------- */ size_t -#if defined(H5_HAVE_COMPRESS2) +#if defined(H5_HAVE_COMPRESSION) H5Z_filter_deflate (unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf) @@ -52,7 +52,7 @@ H5Z_filter_deflate (unsigned UNUSED flags, size_t cd_nelmts, { size_t ret_value = 0; void *outbuf = NULL; -#if defined(H5_HAVE_COMPRESS2) +#if defined(H5_HAVE_COMPRESSION) int aggression = 6; int status; #endif @@ -65,7 +65,7 @@ H5Z_filter_deflate (unsigned UNUSED flags, size_t cd_nelmts, "invalid deflate aggression level"); } -#if defined(H5_HAVE_COMPRESS2) +#if defined(H5_HAVE_COMPRESSION) aggression = cd_values[0]; if (flags & H5Z_FLAG_REVERSE) { /* Input; uncompress */ diff --git a/src/H5config.h.in b/src/H5config.h.in index 49c220d..324d51c 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -9,8 +9,8 @@ /* Define to 1 if you have the `BSDgettimeofday' function. */ #undef HAVE_BSDGETTIMEOFDAY -/* Define to 1 if you have the `compress2' function. */ -#undef HAVE_COMPRESS2 +/* Define if we have zlib compression support */ +#undef HAVE_COMPRESSION /* Define to 1 if you have the `difftime' function. */ #undef HAVE_DIFFTIME @@ -39,9 +39,6 @@ /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */ #undef HAVE_GETCONSOLESCREENBUFFERINFO -/* Define to 1 if you have the `getdents64' function. */ -#undef HAVE_GETDENTS64 - /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME @@ -60,6 +57,12 @@ /* Define to 1 if you have the <globus_common.h> header file. */ #undef HAVE_GLOBUS_COMMON_H +/* Define if we have GPFS support */ +#undef HAVE_GPFS + +/* Define to 1 if you have the <gpfs.h> header file. */ +#undef HAVE_GPFS_H + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H |