- With ompi r22205 it's not necessary to include xt-catamount module

allowing further cleanup.

This commit was SVN r22207.

The following SVN revision numbers were found above:
  r22205 --> open-mpi/ompi@366bd96c88

contrib/platform/ornl/ornl_configure_self_contained

@@ -16,7 +16,6 @@ fi
 
 FLAG=0
 [[ -z ${XTOS_VERSION} ]] && echo "XTOS_VERSION is not set.  Please load the xt-os module" && FLAG=1
-[[ -z ${CATAMOUNT_DIR} ]] && echo "CATAMOUNT_DIR is not set.  Please load the xt-catamount module" && FLAG=1
 [[ -z ${PE_DIR} ]] && echo "PE_DIR is not set.  Please load the xt-pe module" && FLAG=1
 [[ -z ${SE_DIR} ]] && echo "SE_DIR is not set.  Please load the xt-service module" && FLAG=1
 [[ -z ${MPT_DIR} ]] && echo "MPT_DIR is not set.  Please load the xt-mpt module" && FLAG=1
@@ -79,16 +78,16 @@ $SRCDIR/configure \
    --prefix=$PREFIX \
    --enable-static --disable-shared --disable-dlopen --disable-pretty-print-stacktrace --disable-pty-support \
    --with-threads --with-memory-manager=none \
-   --without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
-   --enable-mca-no-build=timer-catamount,maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
+   --without-tm --with-alps --with-portals --with-portals-config=xt3-modex \
+   --enable-mca-no-build=maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
    --with-wrapper-ldflags="${ADD_WRAPPER_LDFLAGS}-L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
    --with-wrapper-libs="-lpct -lalpslli -lalpsutil -lportals -lpthread -lm" \
    ${ADD_COMPILER} \
-   CPPFLAGS="${ADD_CPPFLAGS}-I${CATAMOUNT_DIR}/catamount/linux/include -I${PE_DIR}/include" \
+   CPPFLAGS="${ADD_CPPFLAGS}-I${PE_DIR}/include" \
    FFLAGS="${ADD_FFLAGS}-I${PE_DIR}/include" \
    FCFLAGS="${ADD_FCFLAGS}-I${PE_DIR}/include" \
    LDFLAGS="${ADD_LDFLAGS}-L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
-   LIBS="${ADD_LIBS}-lrt -lpct -lalpslli -lalpsutil -lportals -lpthread -lm" | tee build.log
+   LIBS="${ADD_LIBS}-lpct -lalpslli -lalpsutil -lportals -lpthread -lrt -lm" | tee build.log
 
 #
 # To build orted static, use the libtool-flag -all-static