corrected picl dependency checking to occur in the hwloc.m4 instead of Makefile.am

This commit was SVN r26595.

opal/mca/hwloc/hwloc142/README-ompi.txt

@@ -4,3 +4,4 @@ the v1.4.2 release:
 https://svn.open-mpi.org/trac/hwloc/changeset/4481
 https://svn.open-mpi.org/trac/hwloc/changeset/4483
 https://svn.open-mpi.org/trac/hwloc/changeset/4532
+https://svn.open-mpi.org/trac/hwloc/changeset/4542

opal/mca/hwloc/hwloc142/hwloc/config/hwloc.m4

@@ -10,6 +10,7 @@ dnl                         All rights reserved.
 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 @@ EOF])
                    [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,

opal/mca/hwloc/hwloc142/hwloc/src/Makefile.am

@@ -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 @@ endif HWLOC_HAVE_LIBPCI
 if HWLOC_HAVE_SOLARIS
 sources += topology-solaris.c
 sources += topology-solaris-chiptype.c
-ldflags += -lpicl
 endif HWLOC_HAVE_SOLARIS
 
 if HWLOC_HAVE_LINUX