Remove useless header file ompi.h (it was syntactic sugar for

including a few other OMPI header files, most of which usually weren't
needed). 

This commit was SVN r4149.

config/mca_configure.ac

@@ -316,16 +316,16 @@ if test -z "$found_ompi_headers"; then
     if test -n "$with_openmpi"; then
         if test -d $with_opemnpi ; then
             if test -d "$with_openmpi/include/openmpi" -a \
-                -f "$with_openmpi/include/openmpi/include/ompi.h"; then
+                -f "$with_openmpi/include/openmpi/include/ompi_socket_errno.h"; then
                 INCFLAGS="-I$with_openmpi/include/openmpi -I$with_openmpi/include"
                 found_ompi_headers=1
                 AC_MSG_RESULT([$with_openmpi/include/openmpi])
             elif test -d "$with_openmpi/openmpi" -a \
-                -f "$with_openmpi/openmpi/include/ompi.h"; then
+                -f "$with_openmpi/openmpi/include/ompi_socket_errno.h"; then
                 INCFLAGS="-I$with_openmpi/openmpi I$with_openmpi/openmpi"
                 found_ompi_headers=1
                 AC_MSG_RESULT([$with_openmpi/openmpi])
-            elif test -f "$with_openmpi/include/ompi.h"; then
+            elif test -f "$with_openmpi/include/ompi_socket_errno.h"; then
                 INCFLAGS="-I$with_openmpi -I$with_openmpi/.."
                 found_ompi_headers=1
                 AC_MSG_RESULT([$with_openmpi])
@@ -348,7 +348,7 @@ if test -z "$found_ompi_headers"; then
     # preprocessor's default search path)
 
     if test -z "$found_ompi_headers"; then
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include "include/ompi.h"]], 
+        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include "include/ompi_socket_errno.h"]], 
                           [[]]), 
             [found_ompi_headers=1])
         if test -n "$found_ompi_headers"; then

src/include/Makefile.am

@@ -18,7 +18,6 @@ SUBDIRS = sys
 
 noinst_HEADERS = \
         constants.h \
-        ompi.h \
         totalview.h \
         types.h \
         ompi_socket_errno.h

src/include/ompi.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University.
- *                         All rights reserved.
- * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
- *                         All rights reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
- *                         University of Stuttgart.  All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-#ifndef OMPI_H
-#define OMPI_H
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#include "ompi_config.h"
-#include "types.h"
-#include "constants.h"
-
-#endif /* OMPI_H */

src/info/info.c

@@ -13,6 +13,8 @@
  */
 
 #include "ompi_config.h"
+
+#include "include/constants.h"
 #include "info/info.h"
 #include "mpi/runtime/params.h"
 #include "util/output.h"

src/info/info.h

@@ -22,7 +22,6 @@
 #include "class/ompi_list.h"
 #include "class/ompi_pointer_array.h"
 #include "threads/mutex.h"
-#include "include/ompi.h"
 
 
 /**

src/mca/iof/base/base.h

@@ -21,7 +21,6 @@
 #define MCA_IOF_BASE_H
 
 #include "ompi_config.h"
-#include "include/ompi.h"
 #include "class/ompi_free_list.h"
 #include "threads/condition.h"
 #include "mca/mca.h"

src/mca/iof/iof.h

@@ -21,7 +21,6 @@
 #define MCA_IOF_H
 
 #include "ompi_config.h"
-#include "include/ompi.h"
 #include "class/ompi_list.h"
 #include "mca/mca.h"
 #include "mca/ns/ns.h"

src/mca/iof/proxy/iof_proxy_component.c

@@ -13,6 +13,8 @@
  */
 
 #include "ompi_config.h"
+
+#include "include/constants.h"
 #include "util/proc_info.h"
 #include "util/output.h"
 #include "runtime/ompi_progress.h"

src/mca/pml/pml.h

@@ -60,7 +60,6 @@
 #define MCA_PML_H
 
 #include "ompi_config.h"
-#include "include/ompi.h"
 #include "class/ompi_list.h"
 #include "communicator/communicator.h"
 #include "datatype/datatype.h"

src/mca/ptl/ptl.h

@@ -241,7 +241,6 @@
 #define MCA_PTL_H
 
 #include "mca/mca.h"
-#include "include/ompi.h"
 #include "mca/pml/pml.h"
 #include "include/types.h"