mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20891] Purpose:

Browse Source 
Changes configure/configure.in to use the same CFLAGS and CPPFLAGS in the configure tests that are used to build the library.

Description:
    Only AM_CPPFLAGS was propagated to the CPPFLAGS that were used to build the library.  Now H5_CPPFLAGS, AM_CFLAGS and H5_CFLAGS are used in the configure tests.

Tested on:
    jam(linux32-LE) freedom(bsd63-LE) linew(solaris-BE) tejeda(darwin32 LE)
This commit is contained in:
Dana Robinson 2011-05-23 12:02:39 -05:00
parent 0db46e50d2
commit c8d91d05a4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 20720 2011-05-04 16:43:16Z lrknox .
# From configure.in Id: configure.in 20890 2011-05-23 14:19:26Z hdftest .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HDF5 1.9.82.
#
@ -22499,7 +22499,8 @@ case "$host_cpu-$host_vendor-$host_os" in
;;
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. */

8
configure.in
View File

@ -1391,9 +1391,11 @@ case "$host_cpu-$host_vendor-$host_os" in
;;
esac
dnl Need to add AM_CPPFLAGS into CPPFLAGS to make them visible for configure checks.
dnl Note: CPPFLAGS will be restored by the end of configure.
CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
dnl Need to add the AM_ and H5_ into CPFLAGS/CPPFLAGS to make them visible
dnl for configure checks.
dnl Note: Both will be restored by the end of configure.
CPPFLAGS="$H5_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
CFLAGS="$H5_CFLAGS $AM_CFLAGS $CFLAGS"
AC_TRY_COMPILE([#include <sys/types.h>],
[off64_t n = 0;],