configure: Fix workaround for libxml fail.

configure.ac

@@ -561,7 +561,9 @@ ACX_MPI_DEFECTS(,,
      [workaround_successful=false
       AC_MSG_WARN([known problem detected, attempting work-around!])
       ACX_LIBXML2_WORKAROUND(,[mpi_fortran_startup.f90],
-        [AC_LIBOBJ([xt_xmlXPathInit])
+        [AS_CASE([$acx_workaround],
+           [xt_xmlXPathInit],[AC_LIBOBJ([xt_xmlXPathInit])],
+           [xt_xmlInitParser],[AC_LIBOBJ([xt_xmlInitParser])])
          workaround_successful=:],
         [AC_MSG_NOTICE(
            [Could not apply libxml2 SIGFPE bug work-around.])])
@@ -602,9 +604,7 @@ AM_CONDITIONAL([USE_NB_A2A],[test $MPI_VERSION -ge 3 && test x"$xt_disable_nb_a2
 AS_IF([test $MPI_VERSION -ge 3 && test x"$xt_disable_nb_a2a" = xno],
   [AC_DEFINE([XT_CAN_USE_MPI_NEIGHBOR_ALLTOALL],[1],
      [defined if MPI_Neighbor_alltoall functions are actually working])])
-AM_CONDITIONAL([XT_ADD_MPI_WORKAROUND],
-  [test x${acx_opal_datatype_add_workaround+set} = xset \
-     -o x${acx_yaksa_add_workaround+set} = xset])
+AM_CONDITIONAL([XT_ADD_MPI_WORKAROUND], [test -n "$LIBOBJS"])
 AS_IF([test x${acx_opal_datatype_add_workaround+set} = xset \
          -o x${acx_yaksa_add_workaround+set} = xset],
   [AC_DEFINE_UNQUOTED([XT_WORKAROUND_MPI_SYMBIND],

m4/acx_libxml2_workaround.m4

@@ -54,12 +54,12 @@ AC_DEFUN([ACX_LIBXML2_WORKAROUND],
    dnl so far
    acx_saved_LIBS=$LIBS
    acx_saved_CPPFLAGS=$CPPFLAGS
-   acx_is_affected_libxml2=:
    dnl 2. copy workaround source into place for configure logic
    acx_workaround_dir="$srcdir/m4_default([$5],[src/mpi-workarounds])/"
    for acx_workaround in xt_xmlXPathInit xt_xmlInitParser \
      xt_xmlInitParser.c_def
    do
+     acx_is_affected_libxml2=:
      AS_IF([test "$acx_workaround" = xt_xmlInitParser.c_def],
        [acx_workaround=xt_xmlInitParser
         CPPFLAGS="$CPPFLAGS -DXT_LIBXML_INCLUDE_SUBDIR"])
@@ -73,6 +73,8 @@ AC_DEFUN([ACX_LIBXML2_WORKAROUND],
      LIBS="xt_workaround.$ac_objext -lxml2 $LIBS"
      acx_libxml2_check_dir=`echo "acx_mpi_check_src_" | sed 's@/@<:@^/@:>@*$[]@@'`
      ACX_MPI_DEFECTS([$acx_libxml2_check_dir],, [acx_is_affected_libxml2=false], [$2])
+     AS_IF([$acx_is_affected_libxml2],
+       [break])
      rm -f xt_workaround.*
    done
    LIBS=$acx_saved_LIBS

src/mpi-workarounds/Makefile.am

@@ -49,7 +49,7 @@ libmpi_workaround_la_SOURCES =
 libmpi_workaround_la_LIBADD = $(LIBOBJS) $(xt_mpi_workaround_LIBS) $(MPI_C_LIB)
 endif
 
-EXTRA_DIST = xt_xmlInitParser.c
+EXTRA_DIST = xt_xmlInitParser.c xt_xmlXPathInit.c
 
 distclean-local:
 	-rm -rf '$(DEPDIR)'