[svn-r7269] Purpose:

    Update

Description:
    Revamped the configuration system. The configurations for the Fortran
    and C++ libraries are no longer separate from the "main"
    configuration system. This involved removing the "configure*" and
    "aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
    merging settings in the config/ subdirectories into the main config/
    subdirectory.

    Fortran header files had to be modified a little for Linux. It was
    checking if it was a Linux machine by some #defines, however with the
    -std=c99 switch, these defines weren't there. I added a check for
    some other ones which should be there whether the -std=c99 switch is
    used or not.

Platforms tested:
    Verbena (Fortran & C++)
    Sol (Fortran & C++)
    Copper (Fortran & C++)
    Modi4 (Parallel, Fortran, & C++)

Misc. update:

5 files changed, 13 insertions, 114 deletions

diff --git a/fortran/src/Dependencies b/fortran/src/Dependencies
index 5e807fa..2afb2ff 100644
--- a/fortran/src/Dependencies
+++ b/fortran/src/Dependencies
@@ -543,5 +543,4 @@ H5FDmpiof.lo: \
    $(top_srcdir)/src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
    $(srcdir)/H5f90proto.h \
-   $(srcdir)/H5Git.h \
-   H5pubconf_fortran.h
+   $(srcdir)/H5Git.h
diff --git a/fortran/src/H5FDmpiof.c b/fortran/src/H5FDmpiof.c
index f5e932f..69a22ec 100644
--- a/fortran/src/H5FDmpiof.c
+++ b/fortran/src/H5FDmpiof.c
@@ -16,7 +16,7 @@
 
 #include "H5f90.h"
 #include <mpi.h> 
-#include "H5pubconf_fortran.h"
+#include "H5pubconf.h"
 
 
 /* Support for C to Fortran translation in MPI */
diff --git a/fortran/src/H5config_fortran.h.in b/fortran/src/H5config_fortran.h.in
deleted file mode 100644
index c37ec5e..0000000
--- a/fortran/src/H5config_fortran.h.in
+++ /dev/null
@@ -1,106 +0,0 @@
-/* src/H5config_fortran.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if support for deflate filter is enabled */
-#undef HAVE_FILTER_DEFLATE
-
-/* Define if support for Fletcher32 checksum is enabled */
-#undef HAVE_FILTER_FLETCHER32
-
-/* Define if support for shuffle filter is enabled */
-#undef HAVE_FILTER_SHUFFLE
-
-/* Define if support for szip filter is enabled */
-#undef HAVE_FILTER_SZIP
-
-/* Define if we have GPFS support */
-#undef HAVE_GPFS
-
-/* Define to 1 if you have the <gpfs.h> header file. */
-#undef HAVE_GPFS_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the `sz' library (-lsz). */
-#undef HAVE_LIBSZ
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */
-#undef HAVE_MPI_MULTI_LANG_Comm
-
-/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */
-#undef HAVE_MPI_MULTI_LANG_Info
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#undef HAVE_NETINET_TCP_H
-
-/* Define if `socklen_t' is defined */
-#undef HAVE_SOCKLEN_T
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define if the stream virtual file driver should be compiled */
-#undef HAVE_STREAM
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-#undef HAVE_SYS_FILIO_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <szlib.h> header file. */
-#undef HAVE_SZLIB_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index 1b5b7ce..663c9b5 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -94,7 +94,8 @@ typedef float             real_f;
 #endif /*IBM6000*/
 
 /* LINUX definitions */
-#if defined(i386) && defined(linux)
+#if (defined(i386) || defined(__i386__)) && (defined(linux) || defined(__linux__))
+
 #define DF_MT             DFMT_LINIX
 typedef char              *_fcd;
 typedef long long         hsize_t_f;
@@ -115,6 +116,7 @@ typedef float             real_f;
 
 /* IA64 LINUX definitions */
 #if defined __ia64
+
 typedef char              *_fcd;
 typedef long              hsize_t_f;
 typedef long              hssize_t_f;
@@ -170,6 +172,7 @@ typedef float         real_f;
 #endif /* IRIX */
 
 #if (defined(SUN) || defined(sun) || defined(__sun__) || defined(__SUNPRO_C)) & !defined(__i386)
+
 #ifdef __STDC__
 #define ANSISUN
 #else /* __STDC__ */
@@ -232,7 +235,7 @@ typedef float            real_f;
 
 #endif /* DEC_ALPHA */
 
-#if defined  __alpha__ && defined __linux__
+#if defined __alpha__ && defined __linux__
 
 #ifndef DEC_ALPHA_LINUX
 #define DEC_ALPHA_LINUX
@@ -291,6 +294,7 @@ typedef float          real_f;
 
 
 #if defined _WINDOWS || defined WIN32
+
 #define GOT_MACHINE 1
 
 #pragma comment( lib, "oldnames" )
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 80c9945..6b80cc5 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -13,18 +13,20 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
-top_srcdir=@top_srcdir@/..
+top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 @COMMENCE@
 
+HDF_FORTRAN="yes"
+
 hdf5_srcdir=$(top_srcdir)/src
 hdf5_builddir=$(top_builddir)/src
 
 TRACE=perl $(top_srcdir)/bin/trace
 
 ## Add `-I.' to the C preprocessor flags.
-CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
+CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) -I$(srcdir) @CPPFLAGS@
 
 ## This is our main target
 LIB=libhdf5_fortran.la
@@ -34,7 +36,7 @@ LIB=libhdf5_fortran.la
 DISTCLEAN=H5fortran_types.f90 h5fc libhdf5_fortran.settings
 
 ## Public header files (to be installed)...
-PUB_HDR=H5pubconf_fortran.h
+PUB_HDR=
 PUB_PROGS=h5fc
 
 ## Source and object files for the library