[svn-r10179] Purpose:

Automake update cleanup and minor changes

Description:
Removed macros in acsite.m4 that are no longer used.
Switched to using autoconf's AC_LANG_PUSH(Fortran) instead of old
AC_LANG_FORTRAN9X macro.
Switched to using AC_LANG_PUSH() and AC_LANG_POP() (from old AC_LANG_X).
Added ifort to list of Fortran compilers configure will look for.
Added a note about automake change to Release Notes.

Platforms tested:
copper, modi4 (parallel and serial), eirene

4 files changed, 146 insertions, 266 deletions

diff --git a/acsite.m4 b/acsite.m4
index 4f816e8..08693c6 100644
--- a/acsite.m4
+++ b/acsite.m4
@@ -19,174 +19,6 @@ dnl -------------------------------------------------------------------------
 dnl -------------------------------------------------------------------------
 
 dnl -------------------------------------------------------------------------
-dnl AC_PROG_F9X
-dnl
-dnl	Check for a Fortran 9X compiler.
-dnl
-AC_DEFUN(AC_PROG_F9X,
-[AC_CHECK_PROGS(F9X, f90 pgf90 xlf90 f95 g95 xlf95 efc)
-test -z "$FC" && AC_MSG_ERROR([no acceptable f9X compiler found in \$PATH])
-
-AC_PROG_F9X_WORKS
-AC_PROG_F9X_GNU
-
-if test $ac_cv_prog_g9x = yes; then
-  G9X=yes
-  dnl Check whether -g works, even if FCFLAGS is set, in case the package
-  dnl plays around with FCFLAGS (such as to build both debugging and
-  dnl normal versions of a library), tasteless as that idea is.
-  ac_test_FCFLAGS="${FCFLAGS+set}"
-  ac_save_FCFLAGS="$FCFLAGS"
-  FCFLAGS=
-  AC_PROG_F9X_G
-  if test "$ac_test_FCFLAGS" = set; then
-    FCFLAGS="$ac_save_FCFLAGS"
-  elif test $ac_cv_prog_f9x_g = yes; then
-    FCFLAGS="-g -O2"
-  else
-    FCFLAGS="-O2"
-  fi
-else
-  G9X=
-  test "${FCFLAGS+set}" = set || FCFLAGS="-g"
-fi
-])
-
-dnl -------------------------------------------------------------------------
-dnl AC_TRY_F9X_COMPILER()
-dnl
-dnl	It would be nice if the compiler actually works.
-dnl
-AC_DEFUN(AC_TRY_F9X_COMPILER, [
-cat > conftest.$ac_ext << EOF
-[$1]
-EOF
-if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-  [$2]=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    [$3]=no
-  else
-    [$3]=yes
-  fi
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
-  [$2]=no
-fi
-rm -fr conftest*
-])
-
-dnl -------------------------------------------------------------------------
-dnl AC_LANG_FORTRAN9X()
-dnl
-dnl	Generic macro to setup the Fortran 9X specific env variables.
-dnl
-m4_define([AC_LANG(FORTRAN9X)],
-[ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&AS_MESSAGE_LOG_FD'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&AS_MESSAGE_LOG_FD'
-cross_compiling=$ac_cv_prog_f9x_cross
-])
-
-AU_DEFUN([AC_LANG_FORTRAN9X], [AC_LANG(FORTRAN9X)])
-
-dnl -------------------------------------------------------------------------
-dnl AC_LANG_F9X_WORKS()
-dnl
-dnl	It would be nice if the compiler actually works.
-dnl
-AC_DEFUN(AC_PROG_F9X_WORKS, [
-AC_MSG_CHECKING([whether the Fortran 9X compiler ($FC $FCFLAGS $LDFLAGS) works])
-AC_LANG_SAVE
-AC_LANG_FORTRAN9X
-AC_TRY_F9X_COMPILER([
-      program conftest
-      end
-], ac_cv_prog_f9x_works, ac_cv_prog_f9x_cross)
-AC_LANG_RESTORE
-AC_MSG_RESULT($ac_cv_prog_f9x_works)
-if test $ac_cv_prog_f9x_works = no; then
-  AC_MSG_ERROR([installation or configuration problem: Fortran 9X compiler cannot create executables.])
-fi
-AC_MSG_CHECKING([whether the Fortran 9X compiler ($FC $FCFLAGS $LDFLAGS) is a cross-compiler])
-AC_MSG_RESULT($ac_cv_prog_f9x_cross)
-cross_compiling=$ac_cv_prog_f9x_cross
-])
-
-dnl -------------------------------------------------------------------------
-dnl AC_PROG_F9X_GNU
-dnl
-dnl	Test whether for Fortran 9X compiler is `g95' (the GNU Fortran 95
-dnl	Compiler). This test depends on whether the Fortran 9X compiler
-dnl	can do CPP pre-processing.
-dnl
-AC_DEFUN(AC_PROG_F9X_GNU,
-[AC_CACHE_CHECK(whether we are using GNU Fortran 95, ac_cv_prog_g9x,
-[cat > conftest.fpp <<EOF
-#ifdef __GNUC__
-  yes
-#endif
-EOF
-if AC_TRY_COMMAND($FC -E conftest.fpp) | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_g9x=yes
-else
-  ac_cv_prog_g9x=no
-fi])])
-
-dnl -------------------------------------------------------------------------
-dnl AC_PROG_F9X_G
-dnl
-dnl	Test whether the Fortran 9X compiler can accept the `-g' option
-dnl	to enable debugging.
-dnl
-AC_DEFUN(AC_PROG_F9X_G,
-[AC_CACHE_CHECK(whether $FC accepts -g, ac_cv_prog_f9x_g,
-[cat > conftest.f << EOF
-       program conftest
-       end
-EOF
-if test -z "`$FC -g -c conftest.f 2>&1`"; then
-  ac_cv_prog_f9x_g=yes
-else
-  ac_cv_prog_f9x_g=no
-fi
-rm -f conftest*
-])])
-
-dnl -------------------------------------------------------------------------
-dnl AC_F9X_OPT_FLAGS()
-dnl
-dnl	Check for optimizer flags the Fortran compiler can use.
-dnl
-AC_DEFUN(AC_F9X_OPT_FLAGS,
-[AC_MSG_CHECKING([for $FC optimizer flags])
-AC_LANG_SAVE
-AC_LANG_FORTRAN9X
-
-for flags in "-fast" "-O3" "-O" "";do
-  cat > conftest.$ac_ext <<EOF
-      program main
-      end
-EOF
-  ac_compile='${FC-f90} -c $flag $FCFLAGS conftest.$ac_ext 1>&AS_MESSAGE_LOG_FD'
-  if AC_TRY_EVAL(ac_compile); then
-    if grep 'passed to ld' conftest.out > /dev/null 2>&1; then :; else
-      FCFLAGS="$FCFLAGS $flags"
-      break
-    fi
-  fi
-done
-
-if test -n "$flags"; then
-  echo "$flags" 1>&6
-else
-  echo "none" 1>&6
-fi
-rm -f conftest*
-])
-
-dnl -------------------------------------------------------------------------
 dnl AC_F9X_MODS()
 dnl
 dnl	Check how F9X handles modules. This macro also checks which
@@ -194,8 +26,7 @@ dnl	command-line option to use to include the module once it's built.
 dnl
 AC_DEFUN(AC_F9X_MODS,
 [AC_MSG_CHECKING(what $FC does with modules)
-AC_LANG_SAVE
-AC_LANG_FORTRAN9X
+AC_LANG_PUSH(Fortran)
 
 test -d conftestdir || mkdir conftestdir
 cd conftestdir
@@ -268,6 +99,7 @@ fi
 AC_SUBST(F9XMODFLAG)
 AC_SUBST(F9XMODEXT)
 rm -rf conftest*
+AC_LANG_POP(Fortran)
 ])
 
 dnl -------------------------------------------------------------------------
@@ -279,8 +111,7 @@ dnl AC_TRY_FCOMPILE(FUNCTION-BODY,
 dnl                 [ACTION-IF-SUCCESS], [ACTION-IF-NOT-SUCCESS])
 dnl
 AC_DEFUN([AC_TRY_FCOMPILE],
-[AC_LANG_SAVE
-AC_LANG_FORTRAN9X
+[AC_LANG_PUSH(Fortran)
 
 test -d conftestdir || mkdir conftestdir
 cd conftestdir
@@ -299,6 +130,7 @@ else
 fi
 cd ..
 rm -rf conftest*
+AC_LANG_POP(Fortran)
 ])
 
 dnl -------------------------------------------------------------------------
@@ -310,8 +142,7 @@ dnl AC_TRY_FLINK(INCLUDES, FUNCTION-BODY,
 dnl              [ACTION-IF-SUCCESS], [ACTION-IF-NOT-SUCCESS])
 dnl
 AC_DEFUN([AC_TRY_FLINK],
-[AC_LANG_SAVE
-AC_LANG_FORTRAN9X
+[AC_LANG_PUSH(Fortran)
 
 test -d conftestdir || mkdir conftestdir
 cd conftestdir
@@ -333,6 +164,7 @@ else
 fi
 cd ..
 rm -rf conftest*
+AC_LANG_POP(Fortran)
 ])
 
 dnl -------------------------------------------------------------------------
@@ -344,8 +176,7 @@ dnl AC_CHECK_FLIB(LIBRARY, FUNCTION-BODY,
 dnl               [ACTION-IF-SUCCESS], [ACTION-IF-NOT-SUCCESS])
 dnl
 AC_DEFUN([AC_CHECK_FLIB],
-[AC_LANG_SAVE
-AC_LANG_FORTRAN9X
+[AC_LANG_PUSH(Fortran)
 
 test -d conftestdir || mkdir conftestdir
 cd conftestdir
@@ -371,6 +202,7 @@ else
 fi
 cd ..
 rm -rf conftest*
+AC_LANG_POP(Fortran)
 ])
 
 dnl -------------------------------------------------------------------------
diff --git a/configure b/configure
index 1df2fd6..64e827f 100755
--- a/configure
+++ b/configure
@@ -3405,6 +3405,8 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
         FCFLAGS="${FCFLAGS} ${FFLAGS}"
 
+        FC_SRCEXT=f90
+
 
 
 
@@ -3413,7 +3415,7 @@ ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc
+  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3455,7 +3457,7 @@ fi
 fi
 if test -z "$FC"; then
   ac_ct_FC=$FC
-  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc
+  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -3500,7 +3502,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:3503:" \
+echo "$as_me:3505:" \
      "checking for Fortran compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -3645,12 +3647,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   echo "$as_me:$LINENO: checking what $FC does with modules" >&5
 echo $ECHO_N "checking what $FC does with modules... $ECHO_C" >&6
-
-
-ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
 test -d conftestdir || mkdir conftestdir
@@ -3729,14 +3729,20 @@ fi
 
 
 rm -rf conftest*
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 
         F77=$FC
 
-    ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+    ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
         FCFLAGS_saved=$FCFLAGS
@@ -3744,12 +3750,10 @@ cross_compiling=$ac_cv_prog_f9x_cross
 
   echo "$as_me:$LINENO: checking if compiler supports -I. option" >&5
 echo $ECHO_N "checking if compiler supports -I. option... $ECHO_C" >&6
-
-
-ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+  ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
 test -d conftestdir || mkdir conftestdir
@@ -3779,6 +3783,11 @@ echo "${ECHO_T}no" >&6
 fi
 cd ..
 rm -rf conftest*
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
 
 
     ac_ext=c
@@ -5548,7 +5557,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5551 "configure"' > conftest.$ac_ext
+  echo '#line 5560 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6662,7 +6671,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:6665:" \
+echo "$as_me:6674:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7731,11 +7740,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7734: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7738: \$? = $ac_status" >&5
+   echo "$as_me:7747: \$? = $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
@@ -7986,11 +7995,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7989: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7998: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7993: \$? = $ac_status" >&5
+   echo "$as_me:8002: \$? = $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
@@ -8046,11 +8055,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8049: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8058: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8053: \$? = $ac_status" >&5
+   echo "$as_me:8062: \$? = $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
@@ -10246,7 +10255,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10249 "configure"
+#line 10258 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10344,7 +10353,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10347 "configure"
+#line 10356 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12564,11 +12573,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12567: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12576: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12571: \$? = $ac_status" >&5
+   echo "$as_me:12580: \$? = $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
@@ -12624,11 +12633,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12627: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12636: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12631: \$? = $ac_status" >&5
+   echo "$as_me:12640: \$? = $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
@@ -13987,7 +13996,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13990 "configure"
+#line 13999 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14085,7 +14094,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14088 "configure"
+#line 14097 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14940,11 +14949,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14943: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14952: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14947: \$? = $ac_status" >&5
+   echo "$as_me:14956: \$? = $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
@@ -15000,11 +15009,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15003: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15012: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15007: \$? = $ac_status" >&5
+   echo "$as_me:15016: \$? = $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
@@ -17056,11 +17065,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17059: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17068: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17063: \$? = $ac_status" >&5
+   echo "$as_me:17072: \$? = $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
@@ -17311,11 +17320,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17314: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17323: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17318: \$? = $ac_status" >&5
+   echo "$as_me:17327: \$? = $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
@@ -17371,11 +17380,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17374: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17383: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17378: \$? = $ac_status" >&5
+   echo "$as_me:17387: \$? = $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
@@ -19571,7 +19580,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19574 "configure"
+#line 19583 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19669,7 +19678,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19672 "configure"
+#line 19681 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -45330,10 +45339,10 @@ echo "${ECHO_T}none" >&6
 esac
 
 if test "X$HDF_FORTRAN" = "Xyes"; then
-    ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+    ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
   case "$FC" in
@@ -45649,18 +45658,16 @@ rm -f conftest.err conftest.$ac_objext \
     fi
 
     if test "X$HDF_FORTRAN" = "Xyes"; then
-            ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
-
-
+            ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
-ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+            ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
 test -d conftestdir || mkdir conftestdir
@@ -45689,12 +45696,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 
 else
   :
-
-
-ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+  ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
 test -d conftestdir || mkdir conftestdir
@@ -45732,19 +45737,27 @@ else
 fi
 cd ..
 rm -rf conftest*
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
 
 fi
 cd ..
 rm -rf conftest*
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
-                  if test "X$PARALLEL" = "Xyes"; then
-
 
-ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+                  if test "X$PARALLEL" = "Xyes"; then
+        ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
 test -d conftestdir || mkdir conftestdir
@@ -45773,12 +45786,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 
 else
   :
-
-
-ac_ext=f90
-ac_compile='${FC-f90} -c $FCFLAGS conftest.$ac_ext 1>&5'
-ac_link='${FC-f90} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_f9x_cross
+  ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
 
 test -d conftestdir || mkdir conftestdir
@@ -45816,10 +45827,20 @@ else
 fi
 cd ..
 rm -rf conftest*
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
 
 fi
 cd ..
 rm -rf conftest*
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
 
       fi
 
diff --git a/configure.in b/configure.in
index 6ba1d00..94932fb 100644
--- a/configure.in
+++ b/configure.in
@@ -280,13 +280,18 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   dnl
   FCFLAGS="${FCFLAGS} ${FFLAGS}"
 
+  dnl --------------------------------------------------------------------
+  dnl Fortran source extention
+  dnl
+  FC_SRCEXT=f90
+
   AC_SUBST([F9XSUFFIXFLAG])
   AC_SUBST([FSEARCH_DIRS])
 
   dnl --------------------------------------------------------------------
   dnl Check for a Fortran 9X compiler and how to include modules.
   dnl 
-  AC_PROG_FC([f90 pgf90 slf90 f95 g95 xlf95 efc],)
+  AC_PROG_FC([f90 pgf90 slf90 f95 g95 xlf95 efc ifort],)
   AC_F9X_MODS
 
   dnl It seems that libtool (as of Libtool 1.5.14) is trying to
@@ -295,7 +300,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   F77=$FC
 
   dnl Change to the Fortran 90 language
-  AC_LANG_FORTRAN9X
+  AC_LANG_PUSH(Fortran)
 
   dnl --------------------------------------------------------------------
   dnl See if the compiler will support the "-I." option
@@ -311,8 +316,8 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
      AC_MSG_RESULT(no)
      FCFLAGS="$FCFLAGS_saved")
 
-  dnl Change to the C language
-  AC_LANG_C
+  dnl Change back to the C language
+  AC_LANG_POP(Fortran)
 else
   echo "no"
 fi
@@ -338,7 +343,7 @@ if test "X$HDF_CXX" = "Xyes"; then
   HDF5_INTERFACES="$HDF5_INTERFACES c++"
 
   dnl Change to the C++ language
-  AC_LANG_CPLUSPLUS
+  AC_LANG_PUSH(C++)
 
   AC_MSG_CHECKING([if $CXX needs old style header files in includes])
   AC_TRY_RUN([
@@ -416,8 +421,8 @@ int main(void) {
     CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST"
   ])
 
-  dnl Change to the C language
-  AC_LANG_C
+  dnl Change back to the C language
+  AC_LANG_POP(C++)
 else
   echo "no"
 fi
@@ -1992,7 +1997,7 @@ dnl `mpirun' from the same directory as mpif90 if it exists.
 dnl
 if test "X$HDF_FORTRAN" = "Xyes"; then
   dnl Change to the Fortran 90 language
-  AC_LANG_FORTRAN9X
+  AC_LANG_PUSH(Fortran)
 
   case "$FC" in
     *mpif90*)
@@ -2038,7 +2043,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   esac
 
   dnl Change to the C language
-  AC_LANG_C
+  AC_LANG_POP(Fortran)
 fi
 
 dnl ----------------------------------------------------------------------
@@ -2080,7 +2085,7 @@ case "X-$enable_parallel" in
 
     if test "X$HDF_FORTRAN" = "Xyes"; then
       dnl Change to the Fortran 90 language
-      AC_LANG_FORTRAN9X
+      AC_LANG_PUSH(Fortran)
 
       dnl Try link a simple MPI program.  If fail, try again with -lmpi.
       AC_TRY_FLINK(mpif.h, [
@@ -2104,7 +2109,7 @@ case "X-$enable_parallel" in
       fi
 
       dnl Change to the C language
-      AC_LANG_C
+      AC_LANG_POP(Fortran)
     fi
 
     dnl Set RUNPARALLEL to mpirun if not set yet.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 0962a59..07c2711 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -36,6 +36,28 @@ New Features
 
     Configuration:
     --------------
+	- HDF5 now uses automake 1.9.5 to generate Makefiles.in.
+	  This has a number of effects on users:
+          The Fortran compiler should be set using the environment
+          variable $FC, not $F9X.  F9X still works, but is depreciated.
+	  The output of make may be different.  This should be only a
+          cosmetic effect.
+	  make depened (or make dep) is no longer recognized, since automake
+	  handles dependency tracking.
+	  Some new configure options exist.  --enable-dependency-tracking
+          and --disable-dependency-tracking are used to control automake's
+	  dependency tracking.  Dependencies are on by default *on most
+	  platforms and compilers*.  If --enable-dependency-tracking is
+	  used, they will be enabled on any platform.  However, this can
+	  slow down builds or even cause build errors in some cases.
+	  Likewise, --disable-dependency-tracking can speed up builds and
+	  avoid some build errors.
+	  Some make targets have alternate names.  make check-install and
+	  make installcheck do the same thing, for instance.
+	  pmake on IRIX can be invoked from the root directory, but the
+	  -V flag must be used to invoke it in any subdirectory or it
+	  will give an error about undefined variables.
+	  JML 2005/01 - 2005/03
         - Hardware conversion between long double and integers is also added.
           SLU 2005/02/10
         - Started to support software conversion between long double and