cosmetic fixed fpr hcol autotools

Refs: #3694

This commit was SVN r29841.

config/ompi_check_libhcoll.m4

@@ -30,10 +30,16 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[
 			   ompi_check_hcoll_incdir="$ompi_check_hcoll_dir/include"
 			   ompi_check_hcoll_libs=hcoll
 
+			   coll_hcoll_extra_CPPFLAGS="-I$ompi_check_hcoll_incdir/hcoll -I$ompi_check_hcoll_incdir/hcoll/api"
+
+			   AC_SUBST([coll_hcoll_extra_CPPFLAGS])
+			   AC_SUBST([coll_hcoll_HOME], "$ompi_check_hcoll_dir")
+
+
 			   CPPFLAGS_save=$CPPFLAGS
 			   LDFLAGS_save=$LDFLAGS
 			   LIBS_save=$LIBS
-			   CPPFLAGS="$CPPFLAGS -I$ompi_check_hcoll_dir/include -I$ompi_check_hcoll_dir/include/hcoll -I$ompi_check_hcoll_dir/include/hcoll/api"
+			   CPPFLAGS="$CPPFLAGS $coll_hcoll_extra_CPPFLAGS"
 
 			   OPAL_LOG_MSG([$1_CPPFLAGS : $$1_CPPFLAGS], 1)
 			   OPAL_LOG_MSG([$1_LDFLAGS  : $$1_LDFLAGS], 1)

ompi/mca/coll/fca/configure.m4

@@ -29,6 +29,5 @@ AC_DEFUN([MCA_ompi_coll_fca_CONFIG],[
     AC_SUBST([coll_fca_CPPFLAGS])
     AC_SUBST([coll_fca_LDFLAGS])
     AC_SUBST([coll_fca_LIBS])
-	AC_SUBST(coll_fca_HOME, "$ompi_check_fca_dir")
 ])dnl
 

ompi/mca/coll/hcoll/Makefile.am

@@ -10,7 +10,7 @@
 #
 #
 
-AM_CPPFLAGS = $(coll_hcoll_CPPFLAGS) -DCOLL_HCOLL_HOME=\"$(coll_hcoll_HOME)\" -I$(coll_hcoll_HOME)/include/hcoll/api
+AM_CPPFLAGS = $(coll_hcoll_CPPFLAGS) -DCOLL_HCOLL_HOME=\"$(coll_hcoll_HOME)\" $(coll_hcoll_extra_CPPFLAGS)
 
 coll_hcoll_sources = \
 		coll_hcoll.h \

ompi/mca/coll/hcoll/configure.m4

@@ -28,11 +28,10 @@ AC_DEFUN([MCA_ompi_coll_hcoll_CONFIG],[
            $1],
           [$2])
 
-    # substitute in the things needed to build fca
+    # substitute in the things needed to build hcoll
     AC_SUBST([coll_hcoll_CFLAGS])
     AC_SUBST([coll_hcoll_CPPFLAGS])
     AC_SUBST([coll_hcoll_LDFLAGS])
     AC_SUBST([coll_hcoll_LIBS])
-	AC_SUBST(coll_hcoll_HOME, "$ompi_check_hcoll_dir")
 ])dnl