HWLOC/Libevent: Handle non-pkg-config LIBS

Better handle setting the wrapper compiler LIBS for hwloc and
libevent when they are co-built and pkg-config is not available.
Previously, we would try to add the .la files to the wrapper compilers,
which is probably not what we wanted.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>

Author: bwbarrett

config/opal_config_hwloc.m4

@@ -92,8 +92,10 @@ AC_DEFUN([OPAL_CONFIG_HWLOC], [
           [opal_hwloc_WRAPPER_LDFLAGS="$pkg_config_ldflags"
            opal_hwloc_WRAPPER_LIBS="$pkg_config_libs"],
           [# guess that what we have from compiling OMPI is good enough
-           opal_hwloc_WRAPPER_LDFLAGS="$opal_hwloc_LDFLAGS"
-           opal_hwloc_WRAPPER_LIBS="$opal_hwloc_LIBS"])
+           AS_IF([test -z "$opal_hwloc_WRAPPER_LDFLAGS"],
+                 [opal_hwloc_WRAPPER_LDFLAGS="$opal_hwloc_LDFLAGS"])
+           AS_IF([test -z "$opal_hwloc_WRAPPER_LIBS"],
+                 [opal_hwloc_WRAPPER_LIBS="$opal_hwloc_LIBS"])])
 
     OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$opal_hwloc_WRAPPER_LDFLAGS])
     OPAL_WRAPPER_FLAGS_ADD([LIBS], [$opal_hwloc_WRAPPER_LIBS])
@@ -199,6 +201,7 @@ AC_DEFUN([_OPAL_CONFIG_HWLOC_INTERNAL], [
          # our tree and in the mean time are referenced by their .la
          # files.
          opal_hwloc_LIBS="$OMPI_TOP_BUILDDIR/$internal_hwloc_location/hwloc/libhwloc.la"
+         opal_hwloc_WRAPPER_LIBS="-lhwloc"
 
          opal_hwloc_header="$OMPI_TOP_BUILDDIR/$internal_hwloc_location/include/hwloc.h"
 

config/opal_config_libevent.m4

@@ -103,8 +103,10 @@ AC_DEFUN([OPAL_CONFIG_LIBEVENT], [
            opal_libevent_WRAPPER_LIBS="$pkg_config_pthreads_libs"
            OPAL_FLAGS_APPEND_MOVE([opal_libevent_WRAPPER_LIBS], [$pkg_config_core_libs])],
           [# guess that what we have from compiling OMPI is good enough
-           opal_libevent_WRAPPER_LDFLAGS="$opal_libevent_LDFLAGS"
-           opal_libevent_WRAPPER_LIBS="$opal_libevent_LIBS"])
+           AS_IF([test -z "$opal_libevent_WRAPPER_LDFLAGS"],
+                 [opal_libevent_WRAPPER_LDFLAGS="$opal_libevent_LDFLAGS"])
+           AS_IF([test -z "$opal_libevent_WRAPPER_LIBS"],
+                 [opal_libevent_WRAPPER_LIBS="$opal_libevent_LIBS"])])
 
     OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$opal_libevent_WRAPPER_LDFLAGS])
     OPAL_WRAPPER_FLAGS_ADD([LIBS], [$opal_libevent_WRAPPER_LIBS])
@@ -239,6 +241,7 @@ AC_DEFUN([_OPAL_CONFIG_LIBEVENT_INTERNAL], [
          # our tree and in the mean time are referenced by their .la
          # files.
          opal_libevent_LIBS="$OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_core.la $OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_pthreads.la"
+	 opal_libevent_WRAPPER_LIBS="-levent_core -levent_pthreads"
 
          opal_libevent_header="$OMPI_TOP_BUILDDIR/$internal_libevent_location/event.h"