From da1bfda6458cd8482eb73606d7085b66dd88b58c Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Wed, 4 Mar 2015 17:01:37 -0500
Subject: [svn-r26363] Partial revert of r26347.

Since off_t is exposed by the C API, the large file definitions MUST
be exposed so that client code matches the library.

These definitions have been switched back to AM_CPPFLAGS, which is
exported to h5cc, etc. The POSIX and GNU definitions changes from
r26347 have been left as using H5_CPPFLAGS, which is not sent to
h5cc as we don't want to inflict our needs on external users.

Fixes: HDFFV-9152

Tested on: h5committest
---
 acsite.m4    | 2 +-
 configure    | 6 +++---
 configure.ac | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acsite.m4 b/acsite.m4
index 722d606..eaab535 100644
--- a/acsite.m4
+++ b/acsite.m4
@@ -48,7 +48,7 @@ done])
 case $$3 in #(
   no | unknown) ;;
   *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4])
-     H5_CPPFLAGS="-D$1=$$3 $H5_CPPFLAGS";;
+     AM_CPPFLAGS="-D$1=$$3 $AM_CPPFLAGS";;
 esac
 rm -rf conftest*[]dnl
 ])# _AC_SYS_LARGEFILE_MACRO_VALUE
diff --git a/configure b/configure
index 14795ab..7fb39a4 100755
--- a/configure
+++ b/configure
@@ -22806,7 +22806,7 @@ cat >>confdefs.h <<_ACEOF
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
 
-     H5_CPPFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits $H5_CPPFLAGS";;
+     AM_CPPFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits $AM_CPPFLAGS";;
 esac
 rm -rf conftest*
 
@@ -22894,7 +22894,7 @@ cat >>confdefs.h <<_ACEOF
 #define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
 
-     H5_CPPFLAGS="-D_LARGE_FILES=$ac_cv_sys_large_files $H5_CPPFLAGS";;
+     AM_CPPFLAGS="-D_LARGE_FILES=$ac_cv_sys_large_files $AM_CPPFLAGS";;
 esac
 rm -rf conftest*
 fi
@@ -22906,7 +22906,7 @@ case "$host_cpu-$host_vendor-$host_os" in
   *linux*)
     ## Make available various LFS-related routines using the following
     ## _LARGEFILE*_SOURCE macros.
-    H5_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $H5_CPPFLAGS"
+    AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
 
     ## Add POSIX support on Linux systems, so <features.h> defines
     ## __USE_POSIX, which is required to get the prototype for fdopen
diff --git a/configure.ac b/configure.ac
index e75bd27..1ba1b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1095,7 +1095,7 @@ case "$host_cpu-$host_vendor-$host_os" in
   *linux*)
     ## Make available various LFS-related routines using the following 
     ## _LARGEFILE*_SOURCE macros.
-    H5_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $H5_CPPFLAGS"
+    AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
 
     ## Add POSIX support on Linux systems, so <features.h> defines
     ## __USE_POSIX, which is required to get the prototype for fdopen
-- 
cgit v0.12