* disable threads by default (temporarily)

* fix dumb commit issue in gm

This commit was SVN r5042.

config/ompi_config_threads.m4

@@ -78,7 +78,7 @@ elif test "$THREAD_TYPE" = "posix"; then
     fi
 elif test "$THREAD_TYPE" = "no"; then
     THREAD_TYPE="none"
-elif test "$THREAD_TYPE" = ""; then
+elif test "$THREAD_TYPE" = "yes"; then
 
     # Actual logic here - properly set THREAD_TYPE - we go for system
     # optimized where ever possible
@@ -100,6 +100,8 @@ elif test "$THREAD_TYPE" = ""; then
 	    fi
 	    ;;
     esac
+elif test -z "$THREAD_TYPE" ; then
+    THREAD_TYPE="none"
 else
 
     AC_MSG_WARN(["*** You have specified a thread type that I do not"])

src/mca/ptl/gm/src/ptl_gm_component.c

@@ -447,13 +447,8 @@ mca_ptl_gm_init( mca_ptl_gm_component_t * gm )
             ptl->thread.t_run = (ompi_thread_fn_t)mca_ptl_gm_thread_progress;
             ptl->thread.t_arg = (void*)ptl;
 #endif  /* OMPI_HAVE_POSIX_THREADS */
-<<<<<<< .working
 	    if( OMPI_SUCCESS != ompi_thread_start( &(ptl->thread) ) ) {
 		break;
-=======
-            if( OMPI_SUCCESS != ompi_thread_start( &(ptl->thread) ) )
-                break;
->>>>>>> .merge-right.r5039
             }
         }
     }