[svn-r17616] Purpose:

    CFLAGS overhaul

Description:

    Modified the way configure handles CFLAGS.

    (note: all changes also apply to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS).

    1. The configure process will now always preserve a user's CFLAGS
    environment variable setup. Any additional flags necessary for compilation
    added at configure time will be passed into the Makefiles as AM_CFLAGS,
    which is an automake construct to be used in addition to CFLAGS.

    This will allow a user to have the final say, as CFLAGS will always appear
    later in the compile line than AM_CFLAGS. Additionally, setting CFLAGS
    during make will no longer completely erase all flags set by configure,
    since they're maintained in AM_CFLAGS.

    2. Additionally, where possible, flags previously being assigned directly
    into CFLAGS (and thus propagating into h5cc) have now been redirected into
    H5_CFLAGS, so they're used ONLY for compiling hdf5, and not embedded into
    the h5cc wrapper script as well.

    *Note that H5_CFLAGS ultimately is assigned into AM_CFLAGS for use in the
    Makefiles. Complete description of changes and build process will be
    included in a Configure Document that Elena and I are working on.

    3. Removed unsupported config files. This includes:

       config/dec-osf*
       config/hpux11.00
       config/irix5.x
       config/powerpc-ibm-aix4.x
       config/rs6000-ibm-aix5.x
       config/unicos*

     4. Modified configure summary to display additional values. Specifically,
     appropriate AM_* variables are being shown, as well as H5_FCFLAGS and
     H5_CXXFLAGS, which were for some reason not already present.

Tested:

    - H5committest
    - Tested on all THG / NCSA machines, using several combinations of the more
      prominent configure options (c++, fortran, szip, threadsafe, parallel,
      et cetera). (Thanks to Quincey for rysnc testing setup!)
    - With regards to new automated testing, anything *necessary* for
      compilation will be caught by the daily tests as it stands now. (i.e.,
      if LDFLAGS is not properly set when szip is used, linking will fail).
      Additionally, with regards to which flags get into h5cc, if any
      *necessary* flags have been improperly removed, then daily tests should
      fail during make installcheck. Additional machine-specific desired
      behaviors and/or checks may have to be set up separately within the
      daily tests, so this is something to work on.

1 files changed, 102 insertions, 51 deletions

diff --git a/configure b/configure
index 3e92fca..c077ef9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 17582 2009-10-02 02:08:59Z koziol .
+# From configure.in Id: configure.in 17589 2009-10-04 12:56:18Z lrknox .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.64 for HDF5 1.9.48.
 #
@@ -887,6 +887,11 @@ HDF_FORTRAN
 STATIC_EXEC
 MPE
 EXTERNAL_FILTERS
+AM_LDFLAGS
+AM_CPPFLAGS
+AM_CXXFLAGS
+AM_FCFLAGS
+AM_CFLAGS
 H5_CXXFLAGS
 H5_FCFLAGS
 H5_CPPFLAGS
@@ -3872,10 +3877,25 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
+
+
+
+
+
+
+AM_CFLAGS="${AM_CFLAGS}"
+AM_CXXFLAGS="${AM_CXXFLAGS}"
+AM_FCFLAGS="${AM_FCFLAGS}"
+AM_CPPFLAGS="${AM_CPPFLAGS}"
+AM_LDFLAGS="${AM_LDFLAGS}"
 CFLAGS="${CFLAGS}"
-CPPFLAGS="${CPPFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
+CPPFLAGS="${CPPFLAGS}"
+LDFLAGS="${LDFLAGS}"
+
+saved_user_LDFLAGS="$LDFLAGS"
+saved_user_CPPFLAGS="$CPPFLAGS"
 
 DEFAULT_LIBS=""
 
@@ -5016,7 +5036,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
 
 
-        FCFLAGS="${FCFLAGS} ${FFLAGS}"
+        AM_FCFLAGS="${AM_FCFLAGS} ${AM_FFLAGS}"
 
         ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
@@ -6927,7 +6947,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
 else
 
     echo yes
-    CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME"
+    AM_CXXFLAGS="${AM_CXXFLAGS} -DOLD_HEADER_FILENAME"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -6964,7 +6984,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
 else
 
      echo no
-     CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE"
+     AM_CXXFLAGS="${AM_CXXFLAGS} -DH5_NO_NAMESPACE"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7000,7 +7020,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
 else
 
      echo no
-     CXXFLAGS="${CXXFLAGS} -DH5_NO_STD"
+     AM_CXXFLAGS="${AM_CXXFLAGS} -DH5_NO_STD"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7032,7 +7052,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
 else
 
      echo no
-     CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED"
+     AM_CXXFLAGS="${AM_CXXFLAGS} -DBOOL_NOTDEFINED"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7114,7 +7134,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
 else
 
     echo no
-    CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST"
+    AM_CXXFLAGS="${AM_CXXFLAGS} -DNO_STATIC_CAST"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7509,7 +7529,7 @@ if test "X${HDF_FORTRAN}" = "Xyes"; then
     if (${FC} -v 2>&1 | grep '^Version 8.') > /dev/null; then
       H5_FORTRAN_SHARED="no"
     else
-      FCFLAGS="${FCFLAGS} -fPIC"
+      AM_FCFLAGS="${AM_FCFLAGS} -fPIC"
     fi
   fi
   if (${FC} +version 2>&1 | grep '^HP F90') > /dev/null; then
@@ -8198,13 +8218,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:8201: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:8221: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:8204: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:8224: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:8207: output\"" >&5)
+  (eval echo "\"\$as_me:8227: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -9409,7 +9429,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9412 "configure"' > conftest.$ac_ext
+  echo '#line 9432 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11728,11 +11748,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11731: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11751: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11735: \$? = $ac_status" >&5
+   echo "$as_me:11755: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12067,11 +12087,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12070: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12090: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12074: \$? = $ac_status" >&5
+   echo "$as_me:12094: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12172,11 +12192,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12175: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12195: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12179: \$? = $ac_status" >&5
+   echo "$as_me:12199: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12227,11 +12247,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12230: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12250: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12234: \$? = $ac_status" >&5
+   echo "$as_me:12254: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14658,7 +14678,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14661 "configure"
+#line 14681 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14754,7 +14774,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14757 "configure"
+#line 14777 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16726,11 +16746,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16749: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16733: \$? = $ac_status" >&5
+   echo "$as_me:16753: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16825,11 +16845,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16848: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16832: \$? = $ac_status" >&5
+   echo "$as_me:16852: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16877,11 +16897,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16880: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16900: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16884: \$? = $ac_status" >&5
+   echo "$as_me:16904: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18394,11 +18414,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18397: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18417: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18401: \$? = $ac_status" >&5
+   echo "$as_me:18421: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18493,11 +18513,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18496: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18516: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18500: \$? = $ac_status" >&5
+   echo "$as_me:18520: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18545,11 +18565,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18548: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18568: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18552: \$? = $ac_status" >&5
+   echo "$as_me:18572: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21158,18 +21178,20 @@ $as_echo_n "checking for large file support mode on Linux... " >&6; }
     if test "X$LINUX_LFS" = "Xyes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
 $as_echo "enabled" >&6; }
-      CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $CPPFLAGS"
+      AM_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
 $as_echo "disabled" >&6; }
     fi
 
-                CPPFLAGS="-D_POSIX_SOURCE $CPPFLAGS"
+                AM_CPPFLAGS="-D_POSIX_SOURCE $AM_CPPFLAGS"
 
-                    CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS"
+                    AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
     ;;
 esac
 
+CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -23201,7 +23223,7 @@ if test "x$ac_cv_header_dmalloc_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DMALLOC_H 1
 _ACEOF
-
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
 else
   CPPFLAGS="$saved_CPPFLAGS"
 fi
@@ -23269,6 +23291,10 @@ else
 fi
 
 
+    if test -n "$HAVE_DMALLOC"; then
+        AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
+    fi
+
     if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
       as_fn_error "couldn't find dmalloc library" "$LINENO" 5
     fi
@@ -23408,7 +23434,7 @@ if test "x$ac_cv_header_zlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB_H 1
 _ACEOF
- HAVE_ZLIB_H="yes"
+ HAVE_ZLIB_H="yes"; AM_CPPFLAGS="$AM_CPPFLAGS -I$zlib_inc"
 else
   CPPFLAGS="$saved_CPPFLAGS"
 fi
@@ -23481,6 +23507,10 @@ if test "x$ac_cv_func_compress2" = x""yes; then :
 fi
 
 
+    if test -n "$HAVE_ZLIB"; then
+        AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib"
+    fi
+
     if test -z "$HAVE_ZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
       as_fn_error "couldn't find zlib library" "$LINENO" 5
     fi
@@ -23628,7 +23658,7 @@ if test "x$ac_cv_header_szlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SZLIB_H 1
 _ACEOF
- HAVE_SZLIB_H="yes"
+ HAVE_SZLIB_H="yes"; AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
 else
   CPPFLAGS="$saved_CPPFLAGS"
 fi
@@ -23696,6 +23726,10 @@ else
 fi
 
 
+    if test -n "$HAVE_SZLIB"; then
+        AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
+    fi
+
     if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
       as_fn_error "couldn't find szlib library" "$LINENO" 5
     fi
@@ -23981,13 +24015,14 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
-
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$pthread_inc"
 else
-  CPPFLAGS="$saved_CPPFLAGS"; unset PTHREAD
+  unset PTHREAD
 fi
 
 done
 
+      CPPFLAGS="$saved_CPPFLAGS"
     else
       for ac_header in pthread.h
 do :
@@ -24063,6 +24098,11 @@ else
   LDFLAGS="$saved_LDFLAGS"; unset PTHREAD
 fi
 
+
+      if test -n "$PTHREAD"; then
+          AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
+      fi
+
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
@@ -25135,7 +25175,7 @@ $as_echo_n "checking how to print long long... " >&6; }
 if test "${hdf5_cv_printf_ll+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
+  LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
 export LD_LIBRARY_PATH
 
 for hdf5_cv_printf_ll in l ll L q unknown; do
@@ -26299,13 +26339,14 @@ if test "x$ac_cv_header_mpe_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MPE_H 1
 _ACEOF
-
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
 else
-  CPPFLAGS="$saved_CPPFLAGS"; unset MPE
+  unset MPE
 fi
 
 done
 
+        CPPFLAGS="$saved_CPPFLAGS"
       else
         for ac_header in mpe.h
 do :
@@ -26436,6 +26477,11 @@ else
   LDFLAGS="$saved_LDFLAGS"; unset MPE
 fi
 
+
+        if test -n "$MPE"; then
+            AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
+        fi
+
       else
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
 $as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
@@ -27862,8 +27908,8 @@ LIBS="$DEFAULT_LIBS $LIBS"
 
  DYNAMIC_DIRS=""
 
-if test -n "$LDFLAGS"; then
-  for d in $LDFLAGS ; do
+if test -n "$AM_LDFLAGS $LDFLAGS"; then
+  for d in $AM_LDFLAGS $LDFLAGS ; do
     case "$d" in
       -L*)
         d="`echo $d | sed -e 's/-L//g'`"
@@ -27878,9 +27924,9 @@ if test -n "$LDFLAGS"; then
   done
 fi
 
-if test -n "$CPPFLAGS"; then
+if test -n "$AM_CPPFLAGS"; then
   TEMP_CPPFLAGS=""
-  for d in $CPPFLAGS ; do
+  for d in $AM_CPPFLAGS ; do
     case "$d" in
       -I.*)
                         d="`echo $d | sed -e 's/-I//g'`"
@@ -27889,7 +27935,7 @@ if test -n "$CPPFLAGS"; then
     esac
     TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS"
   done
-  CPPFLAGS=$TEMP_CPPFLAGS
+  AM_CPPFLAGS=$TEMP_CPPFLAGS
 fi
 
 
@@ -28141,6 +28187,11 @@ fi
 
 
 
+CPPFLAGS="$saved_user_CPPFLAGS"
+LDFLAGS="$saved_user_LDFLAGS"
+
+
+
  if test "X$HDF_CXX" = "Xyes"; then
   BUILD_CXX_CONDITIONAL_TRUE=
   BUILD_CXX_CONDITIONAL_FALSE='#'