- Add some #undef's so that we don't conflict with the

AC-automatically-generated macros
- Remove a useless #include

This commit was SVN r7228.

ompi/mca/io/romio/romio/adio/include/io_adio_conv.h

@@ -17,8 +17,6 @@
 #ifndef MCA_IO_ADIO_CONV_H
 #define MCA_IO_ADIO_CONV_H
 
-#include "ompi_config.h"
-
 /* Prefix that we add to all ROMIO symbols */
 #ifdef ROMIO_PREFIX
 #undef ROMIO_PREFIX

ompi/mca/io/romio/romio/adio/include/romioconf.h.in

@@ -19,6 +19,26 @@
  *      See COPYRIGHT in top-level directory.
  */
 
+/* Need to add some undefs here so that we don't conflict with the
+ * main ompi_config.h.  Arrgh.  Stupid autoconf not giving us the option
+ * to not define these macros... grumble... 
+ */
+#if defined(PACKAGE_BUGREPORT)
+#undef PACKAGE_BUGREPORT
+#endif
+#if defined(PACKAGE_NAME)
+#undef PACKAGE_NAME
+#endif
+#if defined(PACKAGE_STRING)
+#undef PACKAGE_STRING
+#endif
+#if defined(PACKAGE_TARNAME)
+#undef PACKAGE_TARNAME
+#endif
+#if defined(PACKAGE_VERSION)
+#undef PACKAGE_VERSION
+#endif
+
 
 /* On RS600, set this if we have aio (?) */
 #undef AIO_HANDLE_IN_AIOCB

ompi/mca/io/romio/romio/configure.in

@@ -31,6 +31,26 @@ AH_TOP([/*
  *  (C) 2001 by Argonne National Laboratory.
  *      See COPYRIGHT in top-level directory.
  */
+
+/* Need to add some undefs here so that we don't conflict with the
+ * main ompi_config.h.  Arrgh.  Stupid autoconf not giving us the option
+ * to not define these macros... grumble... 
+ */
+#if defined(PACKAGE_BUGREPORT)
+#undef PACKAGE_BUGREPORT
+#endif
+#if defined(PACKAGE_NAME)
+#undef PACKAGE_NAME
+#endif
+#if defined(PACKAGE_STRING)
+#undef PACKAGE_STRING
+#endif
+#if defined(PACKAGE_TARNAME)
+#undef PACKAGE_TARNAME
+#endif
+#if defined(PACKAGE_VERSION)
+#undef PACKAGE_VERSION
+#endif
 ])
 
 # Open MPI: added a bunch of AH templates.  Could go manually edit all