Update configury in the new oob ud component: actually check to see if

it succeeds and run $1 or $2, accordingly.  This allows "make dist" to
run properly on machines that do not have OpenFabrics stuff installed
(e.g., the nightly tarball build machine).

There's still more to be done here -- it doesn't check for non-uniform
directories where the OpenFabrics headers/libraries might be
installed.  We might need to re-tool/combine
ompi/config/ompi_check_openib.m4 (which checks for way more than
oob/ud needs) and move it up to config/ompi_check_ofa.m4, or
something...?

This commit was SVN r26350.

orte/mca/oob/ud/Makefile.am

@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(orte_oob_ud_CPPFLAGS)
+
 dist_pkgdata_DATA = help-oob-ud.txt
 
 sources = \
@@ -49,9 +51,11 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_oob_ud_la_SOURCES = $(sources)
-mca_oob_ud_la_LDFLAGS = -module -avoid-version -libverbs
+mca_oob_ud_la_LDFLAGS = -module -avoid-version $(orte_oob_ud_LDFLAGS)
+mca_oob_ud_la_LIBADD = $(orte_oob_ud_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_oob_ud_la_SOURCES = $(sources)
-libmca_oob_ud_la_LDFLAGS = -module -avoid-version
+libmca_oob_ud_la_LDFLAGS = -module -avoid-version $(orte_oob_ud_LDFLAGS)
+libmca_oob_ud_la_LIBADD = $(orte_oob_ud_LIBS)
 

orte/mca/oob/ud/configure.m4

@@ -22,6 +22,34 @@
 AC_DEFUN([MCA_orte_oob_ud_CONFIG],[
     AC_CONFIG_FILES([orte/mca/oob/ud/Makefile])
 
-    AC_CHECK_HEADER([infiniband/verbs.h])
-    AC_CHECK_LIB([ibverbs], [ibv_create_qp])
+    # JMS Still have problems with AC_ARG ENABLE not yet having been
+    # called or CHECK_WITHDIR'ed.
+
+    orte_oob_ud_check_save_CPPFLAGS=$CPPFLAGS
+    orte_oob_ud_check_save_LDFLAGS=$LDFLAGS
+    orte_oob_ud_check_save_LIBS=$LIBS
+
+    OMPI_CHECK_PACKAGE([orte_oob_ud],
+                       [infiniband/verbs.h],
+                       [ibverbs],
+                       [ibv_open_device],
+                       [],
+                       [$ompi_check_openib_dir],
+                       [$ompi_check_openib_libdir],
+                       [orte_oob_ud_check_happy=yes],
+                       [orte_oob_ud_check_happy=no])])
+
+    CPPFLAGS=$orte_oob_ud_check_save_CPPFLAGS
+    LDFLAGS=$orte_oob_ud_check_save_LDFLAGS
+    LIBS=$orte_oob_ud_check_save_LIBS
+
+    AS_IF([test "$orte_oob_ud_check_happy" = "yes"],
+          [$1],
+          [$2])
+
+    # substitute in the things needed to build this component
+    AC_SUBST([orte_oob_ud_CFLAGS])
+    AC_SUBST([orte_oob_ud_CPPFLAGS])
+    AC_SUBST([orte_oob_ud_LDFLAGS])
+    AC_SUBST([orte_oob_ud_LIBS])
 ])dnl