Revert r14435 -- it breaks compiling on Linux with at least the PGI

compiler suite.  The rule is that ompi_info.h is supposed to be the
''first'' file included so that it can affect system header files if
necessary (and it is sometimes necessary, such as with the PGI
compiler suite).

If this breaks VC on Windows, we'll have to find another fix.  More on
the mailing list...

This commit was SVN r14453.

The following SVN revision numbers were found above:
  r14435 --> open-mpi/ompi@a20b43ace9

ompi/tools/ompi_info/components.cc

@@ -17,15 +17,17 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "ompi/runtime/params.h"
 #include "orte/runtime/runtime.h"
+#include "ompi/tools/ompi_info/ompi_info.h"
 
 #include "opal/event/event.h"
 #include "opal/mca/base/base.h"

ompi/tools/ompi_info/ompi_info.cc

@@ -17,6 +17,8 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 #include <utility>
@@ -35,7 +37,6 @@
 #endif
 #include <errno.h>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/class/opal_object.h"
 #include "opal/runtime/opal.h"
@@ -46,7 +47,7 @@
 #include "opal/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "opal/mca/base/base.h"
-
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/threads/mutex.h"
 
 using namespace std;

ompi/tools/ompi_info/ompi_info.h

@@ -19,8 +19,6 @@
 #ifndef OMPI_INFO_H
 #define OMPI_INFO_H
 
-#include "ompi_config.h"
-
 #include <string>
 #include <vector>
 #include <map>

ompi/tools/ompi_info/output.cc

@@ -16,6 +16,8 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 

ompi/tools/ompi_info/param.cc

@@ -16,12 +16,12 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 #include <map>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
-
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -38,6 +38,7 @@
 #include "opal/util/show_help.h"
 #include "opal/memoryhooks/memory.h"
 #include "opal/mca/base/mca_base_param.h"
+#include "ompi/tools/ompi_info/ompi_info.h"
 
 using namespace std;
 using namespace ompi_info;

ompi/tools/ompi_info/version.cc

@@ -16,16 +16,18 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 
 #include <stdio.h>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/version.h"
 #include "orte/version.h"
 #include "ompi/version.h"
 #include "opal/mca/base/base.h"
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/util/printf.h"
 
 using namespace std;