mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r27702] Merge of r27699 from trunk.

Browse Source 
Removed some configure checks for obsolete Unix variants.
The H5pubconf.h.in file that CMake uses was also updated.

Tested on: h5committest
This commit is contained in:
Dana Robinson 2015-09-08 16:24:27 -05:00
parent c6ed371d19
commit 61090f2cc3
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/cmake/H5pubconf.h.in
View File

@ -157,9 +157,6 @@
/* Define to 1 if you have the `gettimeofday' function. */
#cmakedefine H5_HAVE_GETTIMEOFDAY @H5_HAVE_GETTIMEOFDAY@
/* Define to 1 if you have the `get_fpc_csr' function. */
#cmakedefine H5_HAVE_GET_FPC_CSR @H5_HAVE_GET_FPC_CSR@
/* Define if library will contain instrumentation to detect correct
optimization operation */
#cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@
@ -305,15 +302,9 @@
/* Define to 1 if you have the `system' function. */
#cmakedefine H5_HAVE_SYSTEM @H5_HAVE_SYSTEM@
/* Define to 1 if you have the <sys/fpu.h> header file. */
#cmakedefine H5_HAVE_SYS_FPU_H @H5_HAVE_SYS_FPU_H@
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#cmakedefine H5_HAVE_SYS_IOCTL_H @H5_HAVE_SYS_IOCTL_H@
/* Define to 1 if you have the <sys/proc.h> header file. */
#cmakedefine H5_HAVE_SYS_PROC_H @H5_HAVE_SYS_PROC_H@
/* Define to 1 if you have the <sys/resource.h> header file. */
#cmakedefine H5_HAVE_SYS_RESOURCE_H @H5_HAVE_SYS_RESOURCE_H@
@ -323,9 +314,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#cmakedefine H5_HAVE_SYS_STAT_H @H5_HAVE_SYS_STAT_H@
/* Define to 1 if you have the <sys/sysinfo.h> header file. */
#cmakedefine H5_HAVE_SYS_SYSINFO_H @H5_HAVE_SYS_SYSINFO_H@
/* Define to 1 if you have the <sys/timeb.h> header file. */
#cmakedefine H5_HAVE_SYS_TIMEB_H @H5_HAVE_SYS_TIMEB_H@

35
configure.ac
View File

@ -87,11 +87,16 @@ AC_CONFIG_COMMANDS([pubconf], [
## configure is currently running by using the --host=foo flag.
## For machines on which HDF5 is often configured, it can be convenient
## to specify the name of the machine rather than its canonical type.
case $host_alias in
redstorm)
host_alias=x86_64-redstorm-linux-gnu
;;
esac
##
## There are currently no hosts, but if there were they would be
## listed by hostname and the alias would point to a file in
## the config directory:
##
##case $host_alias in
## <some host>)
## host_alias=<config file in config directory>
## ;;
##esac
AC_CANONICAL_HOST
AC_SUBST([CPPFLAGS])
@ -970,24 +975,6 @@ case "`uname`" in
;;
esac
case "$host" in
alpha*-dec*-osf*)
## The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC
## Alpha to turn off UAC fixing. We do *not* attempt to
## locate these files on other systems because there are too
## many problems with including them.
AC_CHECK_HEADERS([sys/sysinfo.h sys/proc.h])
;;
mips*-sgi*)
## The <sys/fpu.h> is needed on the SGI machines to turn off
## denormalized floating-point values going to zero. We do *not*
## attempt to locate these files on other systems because there
## may be problems with including them.
AC_CHECK_HEADERS([sys/fpu.h])
AC_CHECK_FUNCS([get_fpc_csr])
;;
esac
## ----------------------------------------------------------------------
## Some platforms require that all symbols are resolved when a library
## is linked. We can use the -no-undefined flag to tell libtool that
@ -1639,7 +1626,7 @@ fi
## ----------------------------------------------------------------------
## Check for MONOTONIC_TIMER support (used in clock_gettime). This has
## to be done after any POSIX/BSD defines to ensure that the test gets
## to be done after any POSIX defines to ensure that the test gets
## the correct POSIX level on linux.
AC_CHECK_DECL([CLOCK_MONOTONIC],[have_clock_monotonic="yes"],[have_clock_monotonic="no"],[[#include <time.h>]])