[mpich2-commits] r9542 - mpich2/trunk/src/pm/hydra

[balaji at mcs.anl.gov]

Author: balaji
Date: 2012-02-27 21:08:12 -0600 (Mon, 27 Feb 2012)
New Revision: 9542

Modified:
   mpich2/trunk/src/pm/hydra/configure.in
Log:
Append hwloc's internal flags when using it in embedded mode.  This
should fix the nightlies as well as the problem with libpci (see
tt#1552).


Modified: mpich2/trunk/src/pm/hydra/configure.in
===================================================================
--- mpich2/trunk/src/pm/hydra/configure.in	2012-02-27 18:49:56 UTC (rev 9541)
+++ mpich2/trunk/src/pm/hydra/configure.in	2012-02-28 03:08:12 UTC (rev 9542)
@@ -356,6 +356,9 @@
 		   # Only build hwloc in embedded mode
 		   if test "$have_hwloc" = "yes" ; then
 		      hydra_use_embedded_hwloc=yes
+		      CFLAGS="$HWLOC_EMBEDDED_CFLAGS $CFLAGS"
+		      CPPFLAGS="$HWLOC_EMBEDDED_CPPFLAGS $CPPFLAGS"
+		      LIBS="$HWLOC_EMBEDDED_LIBS $LIBS"
 		   fi
                 else
                     AC_CHECK_HEADERS([hwloc.h])