From c8d91d05a40a05e0d73202ad1348294a5446d42e Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 23 May 2011 12:02:39 -0500 Subject: [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) --- configure | 5 +++-- configure.in | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure b/configure index af12cd0..bc05638 100755 --- a/configure +++ b/configure @@ -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 ], [off64_t n = 0;], -- cgit v0.12