Prior fix for the ROMIO re-#define problem didn't really fix the

problem because Autoconf replaced the "#undef ..." with "#define
...".  Fix this by not putting the "#undef ..." statement directly in
romioconf.h[.in] -- but rather having romioconf.h[.in] #include
romioconf-undefs.h, which has the #undef statements.

This commit was SVN r7252.

ompi/mca/io/romio/romio/adio/include/Makefile.am

@@ -27,4 +27,5 @@ noinst_HEADERS = \
         io_adio_conv.h \
         mpio_error.h \
         mpipr.h \
-        mpisgi2.h
+        mpisgi2.h \
+        romioconf-undefs.h

ompi/mca/io/romio/romio/adio/include/romioconf-undefs.h

@@ -0,0 +1,40 @@
+/*
+ *  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 (c) 2004-2005 The Regents of the University of California.
+ *                          All rights reserved.
+ *  $COPYRIGHT$
+ *  
+ *  Additional copyrights may follow
+ *  
+ *  $HEADER$
+ */
+
+#ifndef ROMIO_CONF_UNDEFS_H
+#define ROMIO_CONF_UNDEFS_H
+
+/* 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
+
+#endif /* ROMIOCONF_UNDEFS_H */

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

@@ -16,28 +16,10 @@
  *  $HEADER$
  *
  *  (C) 2001 by Argonne National Laboratory.
- *      See COPYRIGHT in top-level directory.
+ *      See COPYRIGHT in top-level ROMIO 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
+#include "romioconf-undefs.h"
 
 
 /* On RS600, set this if we have aio (?) */

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

@@ -29,28 +29,10 @@ AH_TOP([/*
  *  $HEADER$
  *
  *  (C) 2001 by Argonne National Laboratory.
- *      See COPYRIGHT in top-level directory.
+ *      See COPYRIGHT in top-level ROMIO 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
+#include "romioconf-undefs.h"
 ])
 
 # Open MPI: added a bunch of AH templates.  Could go manually edit all