[svn-r20898] Merge of configure changes 20891-2,4 from the trunk.

1 files changed, 19 insertions, 4 deletions

diff --git a/configure b/configure
index a82362a..1844384 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 20873 2011-05-20 16:34:12Z songyulu .
+# From configure.in Id: configure.in 20893 2011-05-23 17:43:37Z koziol .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.8.8-snap1.
 #
@@ -22102,6 +22102,19 @@ fi
 done
 
 
+for ac_header in mach/mach_time.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "mach/mach_time.h" "ac_cv_header_mach_mach_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_mach_mach_time_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MACH_MACH_TIME_H 1
+_ACEOF
+
+fi
+
+done
+
+
 case "`uname`" in
   CYGWIN*)
     for ac_header in io.h sys/timeb.h
@@ -22523,13 +22536,15 @@ case "$host_cpu-$host_vendor-$host_os" in
         AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
     fi
 
-                                                            H5_CPPFLAGS="-D_POSIX_SOURCE $H5_CPPFLAGS"
+                                                                H5_CPPFLAGS="-D_POSIX_C_SOURCE=199506L $H5_CPPFLAGS"
 
-                    AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
+                            AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
+    AM_LDFLAGS="-lbsd-compat $AM_LDFLAGS"
     ;;
 esac
 
-CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+CPPFLAGS="$H5_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
+CFLAGS="$H5_CFLAGS $AM_CFLAGS $CFLAGS"
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */