diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2011-05-23 17:02:39 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2011-05-23 17:02:39 (GMT) |
| commit | c8d91d05a40a05e0d73202ad1348294a5446d42e (patch) | |
| tree | be35eb0deb5469b98314fbfc6c049ebcd2619b6e | |
| parent | 0db46e50d264ae7b572a0ac118c2bf3e7d54ccf9 (diff) | |
| download | hdf5-c8d91d05a40a05e0d73202ad1348294a5446d42e.zip hdf5-c8d91d05a40a05e0d73202ad1348294a5446d42e.tar.gz hdf5-c8d91d05a40a05e0d73202ad1348294a5446d42e.tar.bz2 | |
[svn-r20891] Purpose:
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)
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -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. */ diff --git a/configure.in b/configure.in index 0dcab5f..f1c0383 100644 --- a/configure.in +++ b/configure.in @@ -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;], |