summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2008-02-19 13:32:19 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2008-02-19 13:32:19 (GMT)
commitff9a968785e6684e53172c2fcad0cb5a9d2e2ab0 (patch)
treee8d3ed7921e812342d345f0ef89c1c5a9dabe93d /configure
parenta937d785c0a3fa0f9342aef69f37d0a91216c620 (diff)
downloadhdf5-ff9a968785e6684e53172c2fcad0cb5a9d2e2ab0.zip
hdf5-ff9a968785e6684e53172c2fcad0cb5a9d2e2ab0.tar.gz
hdf5-ff9a968785e6684e53172c2fcad0cb5a9d2e2ab0.tar.bz2
[svn-r14607] Purpose: Apply Cygwin patch to trunk
Description: This is the same patch that Mike McGreevy helped me with on the 1.8 branch. The latest cygwin DLL has trouble with the global timezone variable. Now in configure, we target CYGWIN with a case statement, and avoid the problem. Tested: Cygwin on WinXP
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure19
1 files changed, 14 insertions, 5 deletions
diff --git a/configure b/configure
index ef0f930..838501c 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 14526 2008-02-07 03:26:45Z epourmal .
+# From configure.in Id: configure.in 14547 2008-02-11 20:09:52Z epourmal .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for HDF5 1.9.0.
#
@@ -45711,15 +45711,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: checking for global timezone variable" >&5
echo $ECHO_N "checking for global timezone variable... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+
+case "'uname'" in
+ CYGWIN*)
+ { echo "$as_me:$LINENO: result: disabled in CYGWIN" >&5
+echo "${ECHO_T}disabled in CYGWIN" >&6; }
+ ;;
+ *)
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/time.h>
-#include <time.h>
+ #include <sys/time.h>
+ #include <time.h>
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -45759,7 +45766,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_TIMEZONE 1
_ACEOF
-{ echo "$as_me:$LINENO: result: yes" >&5
+ { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
echo "$as_me: failed program was:" >&5
@@ -45771,6 +45778,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
+ ;;
+esac
{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }