Index: opal/mca/hwloc/hwloc142/hwloc/src/Makefile.am
===================================================================
--- opal/mca/hwloc/hwloc142/hwloc/src/Makefile.am	(revision 26594)
+++ opal/mca/hwloc/hwloc142/hwloc/src/Makefile.am	(working copy)
@@ -1,7 +1,7 @@
 # Copyright © 2009-2010 inria.  All rights reserved.
 # Copyright © 2009-2010, 2012 Université Bordeaux 1
 # Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
-# Copyright © 2011      Oracle and/or its affiliates.  All rights reserved.
+# Copyright © 2011-2012 Oracle and/or its affiliates.  All rights reserved.
 # See COPYING in top-level directory.
 
 AM_CFLAGS = $(HWLOC_CFLAGS)
@@ -41,7 +41,6 @@
 if HWLOC_HAVE_SOLARIS
 sources += topology-solaris.c
 sources += topology-solaris-chiptype.c
-ldflags += -lpicl
 endif HWLOC_HAVE_SOLARIS
 
 if HWLOC_HAVE_LINUX
Index: opal/mca/hwloc/hwloc142/hwloc/config/hwloc.m4
===================================================================
--- opal/mca/hwloc/hwloc142/hwloc/config/hwloc.m4	(revision 26594)
+++ opal/mca/hwloc/hwloc142/hwloc/config/hwloc.m4	(working copy)
@@ -10,6 +10,7 @@
 dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, 
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright © 2006-2011  Cisco Systems, Inc.  All rights reserved.
+dnl Copyright © 2012       Oracle and/or its affiliates.  All rights reserved.
 dnl See COPYING in top-level directory.
 
 # Main hwloc m4 macro, to be invoked by the user
@@ -375,7 +376,9 @@
                    [HWLOC_LIBS="-lm $HWLOC_LIBS"])
     ], [], [[#include <math.h>]])
 
-    AC_CHECK_HEADERS([picl.h])
+    AC_CHECK_HEADERS([picl.h], [
+      AC_CHECK_LIB([picl], [picl_initialize],
+                   [HWLOC_LIBS="-lpicl $HWLOC_LIBS"])])
 
     AC_CHECK_DECLS([_SC_NPROCESSORS_ONLN,
     		_SC_NPROCESSORS_CONF,