Merge branch 'master_devel' of ssh://git.openfabrics.org/home/mohammads/scm/mstflint...

diff --cc mstflint.spec.in
index ca9f8837aef9a728ba93c438481e608ef6067f50,ca9f8837aef9a728ba93c438481e608ef6067f50..866fa96642e18773322e565c806a3d34088615a6
--- 1/mstflint.spec.in
--- 2/mstflint.spec.in
+++ b/mstflint.spec.in
@@@ -5,6 -5,6 +5,7 @@@
  %{!?buildtype: %define buildtype "native"}
  %{!?noinband: %define noinband 0}
  %{!?nodc: %define nodc 0}
++%{!?enablecs: %define enablecs 0}
  
  %define debug_package %{nil}
  %define optflags -g -O2
@@@ -38,6 -38,6 +39,10 @@@ for network adapters based on Mellanox 
      config_flags="$config_flags --disable-inband"
  %endif
  
++%if %{enablecs}
++    config_flags="$config_flags --enable-cs"
++%endif
++
  %if %{buildtype} == "ppc"
      config_flags="$config_flags --host=ppc-linux"
  %endif