[svn-r17645] Purpose:

    Merge from Trunk

Description:

    Merging all of my CFLAGS-related changes from trunk to 1.8

    This includes revision #s: 17616, 17625, 17627, 17639, and 17643.

Tested:

    h5committest and some additional checks on our FreeBSD as well 
    as NCSA's machines.

1 files changed, 109 insertions, 54 deletions

diff --git a/configure b/configure
index e410924..e1327e4 100755
--- a/configure
+++ b/configure
@@ -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,28 @@ 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_CFLAGS="$CFLAGS"
+saved_user_CXXFLAGS="$CXXFLAGS"
+saved_user_FCFLAGS="$FCFLAGS"
+saved_user_LDFLAGS="$LDFLAGS"
+saved_user_CPPFLAGS="$CPPFLAGS"
 
 DEFAULT_LIBS=""
 
@@ -5016,7 +5039,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 +6950,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 +6987,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 +7023,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 +7055,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 +7137,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 +7532,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
@@ -8195,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:8198: $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:8201: $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:8204: 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"
@@ -9406,7 +9429,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9409 "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=$?
@@ -11726,11 +11749,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:11729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11752: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11733: \$? = $ac_status" >&5
+   echo "$as_me:11756: \$? = $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.
@@ -12065,11 +12088,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:12068: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12091: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12072: \$? = $ac_status" >&5
+   echo "$as_me:12095: \$? = $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.
@@ -12170,11 +12193,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:12173: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12196: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12177: \$? = $ac_status" >&5
+   echo "$as_me:12200: \$? = $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
@@ -12225,11 +12248,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:12228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12251: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12232: \$? = $ac_status" >&5
+   echo "$as_me:12255: \$? = $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
@@ -14656,7 +14679,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14659 "configure"
+#line 14682 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14752,7 +14775,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14755 "configure"
+#line 14778 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16724,11 +16747,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:16727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16750: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16731: \$? = $ac_status" >&5
+   echo "$as_me:16754: \$? = $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.
@@ -16823,11 +16846,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:16826: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16849: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16830: \$? = $ac_status" >&5
+   echo "$as_me:16853: \$? = $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
@@ -16875,11 +16898,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:16878: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16901: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16882: \$? = $ac_status" >&5
+   echo "$as_me:16905: \$? = $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
@@ -18392,11 +18415,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:18395: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18418: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18399: \$? = $ac_status" >&5
+   echo "$as_me:18422: \$? = $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.
@@ -18491,11 +18514,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:18494: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18517: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18498: \$? = $ac_status" >&5
+   echo "$as_me:18521: \$? = $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
@@ -18543,11 +18566,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:18546: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18569: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18550: \$? = $ac_status" >&5
+   echo "$as_me:18573: \$? = $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
@@ -21156,18 +21179,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>
@@ -23186,10 +23211,13 @@ $as_echo "suppressed" >&6; }
     fi
 
     saved_CPPFLAGS="$CPPFLAGS"
+    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
+    saved_AM_LDFLAGS="$AM_LDFLAGS"
 
     if test -n "$dmalloc_inc"; then
       CPPFLAGS="$CPPFLAGS -I$dmalloc_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
     fi
 
     for ac_header in dmalloc.h
@@ -23201,7 +23229,7 @@ if test "x$ac_cv_header_dmalloc_h" = x""yes; then :
 _ACEOF
 
 else
-  CPPFLAGS="$saved_CPPFLAGS"
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
 fi
 
 done
@@ -23209,6 +23237,7 @@ done
 
     if test -n "$dmalloc_lib"; then
       LDFLAGS="$LDFLAGS -L$dmalloc_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -ldmalloc" >&5
@@ -23263,7 +23292,7 @@ _ACEOF
   LIBS="-ldmalloc $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset HAVE_DMALLOC
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DMALLOC
 fi
 
 
@@ -23393,10 +23422,13 @@ $as_echo "suppressed" >&6; }
     fi
 
     saved_CPPFLAGS="$CPPFLAGS"
+    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
+    saved_AM_LDFLAGS="$AM_LDFLAGS"
 
     if test -n "$zlib_inc"; then
       CPPFLAGS="$CPPFLAGS -I$zlib_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$zlib_inc"
     fi
 
     for ac_header in zlib.h
@@ -23408,7 +23440,7 @@ if test "x$ac_cv_header_zlib_h" = x""yes; then :
 _ACEOF
  HAVE_ZLIB_H="yes"
 else
-  CPPFLAGS="$saved_CPPFLAGS"
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
 fi
 
 done
@@ -23416,6 +23448,7 @@ done
 
     if test -n "$zlib_lib"; then
       LDFLAGS="$LDFLAGS -L$zlib_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
@@ -23470,7 +23503,7 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset HAVE_ZLIB
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_ZLIB
 fi
 
     ac_fn_c_check_func "$LINENO" "compress2" "ac_cv_func_compress2"
@@ -23613,10 +23646,13 @@ $as_echo "suppressed" >&6; }
     fi
 
     saved_CPPFLAGS="$CPPFLAGS"
+    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
+    saved_AM_LDFLAGS="$AM_LDFLAGS"
 
     if test -n "$szlib_inc"; then
       CPPFLAGS="$CPPFLAGS -I$szlib_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
     fi
 
     for ac_header in szlib.h
@@ -23628,7 +23664,7 @@ if test "x$ac_cv_header_szlib_h" = x""yes; then :
 _ACEOF
  HAVE_SZLIB_H="yes"
 else
-  CPPFLAGS="$saved_CPPFLAGS"
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
 fi
 
 done
@@ -23636,6 +23672,7 @@ done
 
     if test -n "$szlib_lib"; then
       LDFLAGS="$LDFLAGS -L$szlib_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -lsz" >&5
@@ -23690,7 +23727,7 @@ _ACEOF
   LIBS="-lsz $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset HAVE_SZLIB
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB
 fi
 
 
@@ -23971,7 +24008,9 @@ $as_echo "suppressed" >&6; }
 
     if test -n "$pthread_inc"; then
       saved_CPPFLAGS="$CPPFLAGS"
+      saved_AM_CPPFLAGS="$AM_CPPFLAGS"
       CPPFLAGS="$CPPFLAGS -I$pthread_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$pthread_inc"
       for ac_header in pthread.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
@@ -23981,7 +24020,7 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then :
 _ACEOF
 
 else
-  CPPFLAGS="$saved_CPPFLAGS"; unset PTHREAD
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset PTHREAD
 fi
 
 done
@@ -24005,7 +24044,9 @@ done
 
     if test -n "$pthread_lib"; then
       saved_LDFLAGS="$LDFLAGS"
+      saved_AM_LDFLAGS="$AM_LDFLAGS"
       LDFLAGS="$LDFLAGS -L$pthread_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
@@ -24058,9 +24099,10 @@ _ACEOF
   LIBS="-lpthread $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset PTHREAD
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset PTHREAD
 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; }
@@ -25140,7 +25182,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
@@ -26296,7 +26338,9 @@ fi
 
       if test -n "$mpe_inc"; then
         saved_CPPFLAGS="$CPPFLAGS"
+        saved_AM_CPPFLAGS="$AM_CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -I$mpe_inc"
+        AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
         for ac_header in mpe.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
@@ -26306,7 +26350,7 @@ if test "x$ac_cv_header_mpe_h" = x""yes; then :
 _ACEOF
 
 else
-  CPPFLAGS="$saved_CPPFLAGS"; unset MPE
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset MPE
 fi
 
 done
@@ -26330,7 +26374,9 @@ done
 
       if test -n "$mpe_lib"; then
         saved_LDFLAGS="$LDFLAGS"
+        saved_AM_LDFLAGS="$AM_LDFLAGS"
         LDFLAGS="$LDFLAGS -L$mpe_lib"
+        AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
         { $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; }
 if test "${ac_cv_lib_mpe_MPE_Init_log+set}" = set; then :
@@ -26383,7 +26429,7 @@ _ACEOF
   LIBS="-lmpe $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset MPE
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
 fi
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOG_Init in -llmpe" >&5
@@ -26438,9 +26484,10 @@ _ACEOF
   LIBS="-llmpe $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset MPE
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
 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; }
@@ -27867,8 +27914,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'`"
@@ -27883,9 +27930,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'`"
@@ -27894,7 +27941,7 @@ if test -n "$CPPFLAGS"; then
     esac
     TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS"
   done
-  CPPFLAGS=$TEMP_CPPFLAGS
+  AM_CPPFLAGS=$TEMP_CPPFLAGS
 fi
 
 
@@ -28142,6 +28189,14 @@ fi
 
 
 
+CPPFLAGS="$saved_user_CPPFLAGS"
+LDFLAGS="$saved_user_LDFLAGS"
+FCFLAGS="$saved_user_FCFLAGS"
+CFLAGS="$saved_user_CFLAGS"
+CXXFLAGS="$saved_user_CXXFLAGS"
+
+
+
  if test "X$HDF_CXX" = "Xyes"; then
   BUILD_CXX_CONDITIONAL_TRUE=
   BUILD_CXX_CONDITIONAL_FALSE='#'