[svn-r12887] A fix for linking issues.

Should disable linking against shared libraries in Fortran for compilers that
don't support shared libraries.

Should also fix problem when the wrong Fortran file extension was specified.

If these changes don't solve the Daily Test issues, I'll look at backing out
the autotool version change until I have time to fix them.

Tested on heping, kagiso, juniper.

14 files changed, 14 insertions, 0 deletions

diff --git a/hl/Makefile.in b/hl/Makefile.in
index fee750d..d6b9c17 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -141,6 +141,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index d029fb8..d8a619f 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -137,6 +137,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 9af0167..789b94d 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -134,6 +134,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 1b874c5..808f067 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -158,6 +158,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 21b3ca2..0d9aa58 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -153,6 +153,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index b658a2a..71a85fc 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -134,6 +134,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index a9a4291..f54e510 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -141,6 +141,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index a87b605..c5633e8 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -134,6 +134,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 12b5c7b..07c42cf 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -161,6 +161,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index e34fc52..38646db 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -160,6 +160,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 0e2c881..810c956 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -159,6 +159,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 10461b9..a93e437 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -177,6 +177,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in
index bc3fbf9..021c441 100644
--- a/hl/tools/Makefile.in
+++ b/hl/tools/Makefile.in
@@ -138,6 +138,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 38a9e8d..15f2cfb 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -162,6 +162,7 @@ F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@