[svn-r5226] Purpose:

	Feature Update
Description:
	Modified the AC_OUTPUT macro to coincide with the now-standard way of
	doing things. I.e., you put all of the files you want to generate
	into the AC_CONFIG_FILES macro and invode AC_OUTPUT with no
	parameters.
Platforms tested:
	Linux

3 files changed, 20 insertions, 19 deletions

diff --git a/fortran/acsite.m4 b/fortran/acsite.m4
index 3d83c31..f86f9ff 100644
--- a/fortran/acsite.m4
+++ b/fortran/acsite.m4
@@ -15,7 +15,7 @@ dnl
 dnl	Check for a Fortran 9X compiler.
 dnl
 AC_DEFUN(AC_PROG_F9X,
-[AC_CHECK_PROGS(F9X, f90 pgf90 f95 g95)
+[AC_CHECK_PROGS(F9X, f90 pgf90 xlf90 f95 g95 xlf95)
 test -z "$F9X" && AC_MSG_ERROR([no acceptable f9X compiler found in \$PATH])
 
 AC_PROG_F9X_WORKS
diff --git a/fortran/configure b/fortran/configure
index b7c1286..3437301 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -2939,7 +2939,7 @@ irix5* | irix6*)
 # This must be Linux ELF.
 linux-gnu*)
   case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
@@ -4941,7 +4941,6 @@ else
         # End MAJOR HACK
         #
         #######################################################################
-
 	# Warning - without using the other run time loading flags,
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='${wl}-berok'
@@ -6206,7 +6205,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6209 "configure"
+#line 6208 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6304,7 +6303,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6307 "configure"
+#line 6306 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7207,7 +7206,7 @@ else
 fi
 
 
-for ac_prog in f90 pgf90 f95 g95
+for ac_prog in f90 pgf90 xlf90 f95 g95 xlf95
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8408,6 +8407,7 @@ fi
 saved_no_create=$no_create
 no_create=yes
 ac_config_files="$ac_config_files config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/H5fortran_types.f90 src/Makefile test/Makefile $PARALLEL_MAKE examples/Makefile"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/fortran/configure.in b/fortran/configure.in
index 106bcf1..b013810 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -656,19 +656,20 @@ fi
 dnl Then the config.status file (but not makefiles)
 saved_no_create=$no_create
 no_create=yes
-AC_OUTPUT(config/depend1    
-          config/depend2
-          config/depend3
-          config/depend4
-          config/dependN
-          config/commence
-          config/conclude
-          Makefile
-          src/H5fortran_types.f90
-          src/Makefile
-          test/Makefile
-          $PARALLEL_MAKE
-          examples/Makefile)
+AC_CONFIG_FILES([config/depend1    
+                 config/depend2
+                 config/depend3
+                 config/depend4
+                 config/dependN
+                 config/commence
+                 config/conclude
+                 Makefile
+                 src/H5fortran_types.f90
+                 src/Makefile
+                 test/Makefile
+                 $PARALLEL_MAKE
+                 examples/Makefile])
+AC_OUTPUT
 no_create=$saved_no_create
 
 dnl Then the stamp2 file for H5config.h