[svn-r22430] CMake and configure synchronization effort. CMake added most tests and options: DEBUGPKG not addressed.

Still needed: compiler wrapper scripts

Tested: local linux(cmake) and h5committest

1 files changed, 13 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index 834757b..3283cc8 100644
--- a/configure.in
+++ b/configure.in
@@ -251,6 +251,7 @@ dnl	CPU
 dnl
 dnl If the `OS' ends with a version number then remove it. For instance,
 dnl `freebsd3.1' would become `freebsd'
+
 case $host_os in
   aix*)
     host_os_novers=aix
@@ -710,6 +711,7 @@ dnl ----------------------------------------------------------------------
 dnl Check which archiving tool to use. This needs to be done before
 dnl the AM_PROG_LIBTOOL macro.
 dnl
+
 if test -z "$AR"; then
   AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
 fi
@@ -850,6 +852,7 @@ dnl Furthermore, the name of the compiler might tell us how to run the
 dnl resulting executable. For `mpif90' the executable should be run with
 dnl `mpiexec' from the same directory as mpif90 if it exists.
 dnl
+
 if test "X$HDF_FORTRAN" = "Xyes" ; then
   dnl Change to the Fortran 90 language
   AC_LANG_PUSH(Fortran)
@@ -904,6 +907,7 @@ fi
 dnl -----------------------------------------------------------------------------
 dnl If shared libraries are being used with parallel, disable them, unless the 
 dnl user explicity enables them via the '--enable-shared' option.
+
 if test "X${enable_shared}" = "X" -a "X${enable_parallel}" = "Xyes"; then
     echo '    shared libraries disabled in parallel'
     enable_shared="no"
@@ -918,7 +922,7 @@ fi
 
 dnl ----------------------------------------------------------------------
 dnl Fortran libraries are not currently supported on Mac. Disable them.
-dnl (this is overridable with --enable-unsupported).
+dnl this is overridable with '--enable-unsupported'.
 dnl
 AC_SUBST([H5_FORTRAN_SHARED])
 H5_FORTRAN_SHARED="no"
@@ -927,6 +931,7 @@ if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   H5_FORTRAN_SHARED="yes"
 
   dnl Disable fortran shared libraries on Mac. (MAM - 03/30/11)
+  
   case "`uname`" in
     Darwin*)
     H5_FORTRAN_SHARED="no"
@@ -935,6 +940,7 @@ if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   esac
 
   dnl Report results of check(s)
+  
   if test "X${H5_FORTRAN_SHARED}" = "Xno"; then
     AC_MSG_RESULT([no])
     AC_MSG_WARN([$CHECK_WARN])
@@ -965,12 +971,14 @@ if test "X${HDF_CXX}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   H5_CXX_SHARED="yes"
 
   dnl Disable C++ shared libraries if DD64 flag is being used.
+  
   if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'DD64') > /dev/null; then
     H5_CXX_SHARED="no"
     CHECK_WARN="Shared C++ libraries not currently supported with +DD64 flag."
   fi
 
   dnl Report results of check(s)
+  
   if test "X${H5_CXX_SHARED}" = "Xno"; then
     AC_MSG_RESULT([no])
     AC_MSG_WARN([$CHECK_WARN])
@@ -995,6 +1003,7 @@ dnl pgcc version 6.0x have optimization (-O, -O2 or -O3) problem.  Detect
 dnl these versions and add option "-Mx,28,0x8" to the compiler to avoid
 dnl the problem if optimization is enabled.
 dnl
+
 if (${CC-cc} -V 2>&1 | grep '^pgcc 6.0') > /dev/null && test "X$enable_production" = "Xyes"; then
     echo 'adding compiler flag to avoid optimization problem in pgcc'
     CC="${CC-cc} -Mx,28,0x8"
@@ -1003,6 +1012,7 @@ fi
 dnl ----------------------------------------------------------------------
 dnl Shared libraries are not currently supported under Cygwin, so configure
 dnl disables them unless --enable-unsupported has been supplied by the user.
+
 if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   case "`uname`" in
     CYGWIN*)
@@ -1063,7 +1073,7 @@ esac
 
 dnl ----------------------------------------------------------------------
 dnl Some users have reported problems with libtool's use of '-Wl,-rpath' to
-dnl link shared libraries in nondefulat directories. Allow users to
+dnl link shared libraries in nondefault directories. Allow users to
 dnl disable embedding the rpath information in the executables and to
 dnl instead solely rely on the information in LD_LIBRARY_PATH.
 AC_MSG_CHECKING([if -Wl,-rpath should be used to link shared libs in nondefault directories])
@@ -1277,7 +1287,7 @@ case "`uname`" in
     AC_CHECK_HEADERS([io.h sys/timeb.h])
     ;;
   *)
-    AC_CHECK_HEADERS([io.h winsock.h sys/timeb.h])
+    AC_CHECK_HEADERS([io.h winsock2.h sys/timeb.h])
     ;;
 esac