[svn-r22451] Brought cmake configuration / configure changes from Trunk.

Tested jam, local linux

1 files changed, 18 insertions, 7 deletions

diff --git a/configure b/configure
index 91b277b..993f58b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 22428 2012-06-04 00:24:55Z hdftest .
+# From configure.in Id: configure.in 22449 2012-06-10 23:40:40Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.8.10-snap4.
 #
@@ -3201,6 +3201,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+
 am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3903,6 +3904,7 @@ elif test $hdf5_cv_host != $host; then
   as_fn_error $? "config.cache file is invalid" "$LINENO" 5
 fi
 
+
 case $host_os in
   aix*)
     host_os_novers=aix
@@ -7260,6 +7262,7 @@ done
 fi
 
 
+
 if test -z "$AR"; then
   for ac_prog in ar xar
 do
@@ -7452,6 +7455,7 @@ $as_echo "none" >&6; }
             ;;
 esac
 
+
 if test "X$HDF_FORTRAN" = "Xyes" ; then
     ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
@@ -7506,6 +7510,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 
+
 if test "X${enable_shared}" = "X" -a "X${enable_parallel}" = "Xyes"; then
     echo '    shared libraries disabled in parallel'
     enable_shared="no"
@@ -7525,14 +7530,16 @@ if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
 $as_echo_n "checking if shared Fortran libraries are supported... " >&6; }
   H5_FORTRAN_SHARED="yes"
 
-    case "`uname`" in
+
+  case "`uname`" in
     Darwin*)
     H5_FORTRAN_SHARED="no"
     CHECK_WARN="Shared Fortran libraries not currently supported on Mac."
       ;;
   esac
 
-    if test "X${H5_FORTRAN_SHARED}" = "Xno"; then
+
+  if test "X${H5_FORTRAN_SHARED}" = "Xno"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CHECK_WARN" >&5
@@ -7572,12 +7579,14 @@ if test "X${HDF_CXX}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
 $as_echo_n "checking if shared C++ libraries are supported... " >&6; }
   H5_CXX_SHARED="yes"
 
-    if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'DD64') > /dev/null; then
+
+  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
 
-    if test "X${H5_CXX_SHARED}" = "Xno"; then
+
+  if test "X${H5_CXX_SHARED}" = "Xno"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CHECK_WARN" >&5
@@ -7609,11 +7618,13 @@ else
 fi
 
 
+
 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"
 fi
 
+
 if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   case "`uname`" in
     CYGWIN*)
@@ -22271,7 +22282,7 @@ done
 
     ;;
   *)
-    for ac_header in io.h winsock.h sys/timeb.h
+    for ac_header in io.h winsock2.h sys/timeb.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -25840,7 +25851,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for global timezone variable" >&5
 $as_echo_n "checking for global timezone variable... " >&6; }
 
-
 case "`uname`" in
   CYGWIN*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled in CYGWIN" >&5
@@ -26620,6 +26630,7 @@ else
 $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ extension" >&5
 $as_echo_n "checking for __func__ extension... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext