enable ugni btl to work without disable-dlopen

There were mistakes in the Makefiles for the ugni btl and
mca/common/ugni that prevented the ugni btl from being
used unless one happened to set the --disable-dlopen option
on the config line.

This commit fixes this problem.

opal/mca/btl/ugni/Makefile.am

@@ -44,7 +44,8 @@ mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_ugni_la_SOURCES = $(ugni_SOURCES)
 nodist_mca_btl_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
-mca_btl_ugni_la_LIBADD = $(btl_ugni_LIBS) 
+mca_btl_ugni_la_LIBADD = $(btl_ugni_LIBS)  \
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/ugni/lib@OPAL_LIB_PREFIX@mca_common_ugni.la
 mca_btl_ugni_la_LDFLAGS = -module -avoid-version $(btl_ugni_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)

opal/mca/common/ugni/Makefile.am

@@ -19,7 +19,7 @@ component_noinst = lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst.la
 component_install = lib@OPAL_LIB_PREFIX@mca_common_ugni.la
 
 if MCA_BUILD_opal_common_ugni_DSO
-mcacomponent_LTLIBRARIES = $(component_install)
+lib_LTLIBRARIES = $(component_install)
 else
 noinst_LTLIBRARIES = $(component_noinst)
 endif
@@ -30,7 +30,7 @@ headers = common_ugni.h \
 ugni_SOURCES = common_ugni.c \
                common_ugni_ep.c
 
-mcacomponentdir = $(opallibdir)
+#mcacomponentdir = $(opallibdir)
 lib@OPAL_LIB_PREFIX@mca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)
 nodist_lib@OPAL_LIB_PREFIX@mca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
 lib@OPAL_LIB_PREFIX@mca_common_ugni_la_LIBADD = $(common_ugni_LIBS)