Move #define to Makefile for clarity. Add #ifdef

to priority section.

This commit was SVN r24084.

ompi/mca/pml/bfo/Makefile.am

@@ -19,6 +19,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = -DPML_BFO=1
+
 dist_pkgdata_DATA = \
 	help-mpi-pml-bfo.txt
 

ompi/mca/pml/bfo/pml_bfo.h

@@ -23,7 +23,6 @@
 #ifndef MCA_PML_BFO_H
 #define MCA_PML_BFO_H
 
-#define PML_BFO 1
 #include "ompi_config.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/request/request.h"
@@ -229,9 +228,9 @@ int mca_pml_bfo_send_fin(ompi_proc_t* proc, mca_bml_base_btl_t* bml_btl,
 #if PML_BFO
         ompi_ptr_t hdr_des, uint8_t order, uint32_t status,
         uint16_t seq, uint8_t reqseq, uint16_t ctx, uint32_t src);
-#else
+#else /* PML_BFO */
         ompi_ptr_t hdr_des, uint8_t order, uint32_t status);
-#endif
+#endif /* PML_BFO */
 
 /* This function tries to resend FIN/ACK packets from pckt_pending queue.
  * Packets are added to the queue when sending of FIN or ACK is failed due to

ompi/mca/pml/bfo/pml_bfo_component.c

@@ -107,7 +107,11 @@ static int mca_pml_bfo_component_open(void)
     mca_pml_bfo.free_list_inc =
         mca_pml_bfo_param_register_int("free_list_inc", 64);
     mca_pml_bfo.priority =
+#if PML_BFO
         mca_pml_bfo_param_register_int("priority", 5);
+#else /* PML_BFO */
+        mca_pml_bfo_param_register_int("priority", 20);
+#endif /* PML_BFO */
     mca_pml_bfo.send_pipeline_depth =
         mca_pml_bfo_param_register_int("send_pipeline_depth", 3);
     mca_pml_bfo.recv_pipeline_depth =