Part 2 of the .ompi_unignore patch

This commit was SVN r3760.

config/ompi_mca.m4

@@ -149,32 +149,59 @@ for type in $found_types; do
     for component in $found_components; do
         m=`basename "$component"`
 
-        if test -d $srcdir/$component -a ! -f $srcdir/$component/.ompi_ignore; then
-            ompi_show_subtitle "MCA component $type:$m (no configure script)"
-
-	    # Remove any possible sym link in the mca-dynamic tree
-            
-	    rm -f src/dynamic-mca/$type/$m
-
-            # Now process the component
-
-            MCA_PROCESS_COMPONENT(1, 1, $type, $m)
-
-            # Note that the AM_CONDITIONAL for this component is set in
-            # config/mca_no_configure_components.m4 -- which is generated by
-            # autogen.sh because we cannot have a variable
-            # AM_CONDITIONAL name (which we need here).  Since
-            # autogen.sh knows the name that is necessary, it just
-            # generated the AM_CONDITIONAL directly.  Here, we fill in
-            # the variable that is used in that AM_CONDITIONAL.
-
-            if test "$compile_mode" = "dso"; then
-                value=1
-            else
-                value=0
+        # build if:
+        # - there is no ompi_ignore file
+        # - there is an ompi_ignore, but there is an empty ompi_unignore
+        # - there is an ompi_ignore, but username is in ompi_unignore
+        if test -d $srcdir/$component ; then
+	    # decide if we want the component to be built or not.  This
+	    # is spread out because some of the logic is a little complex
+	    # and test's syntax isn't exactly the greatest.  We want to
+	    # build the component by default.
+            want_component=1
+            if test -f $srcdir/$component/.ompi_ignore ; then
+		# If there is an ompi_ignore file, don't build
+		# the component.  Note that this decision can be
+		# overriden by the unignore logic below.
+                want_component=0
+            fi
+            if test -f $srcdir/$component/.ompi_unignore ; then
+		# if there is an empty ompi_unignore, that is
+		# equivalent to having your userid in the unignore file.
+		# If userid is in the file, unignore the ignore file.
+	        if test ! -s $srcdir/$component/.ompi_unignore ; then
+		    want_component=1
+                elif test ! -z "`grep $USER $srcdir/$component/.ompi_unignore`" ; then
+                    want_component=1
+	        fi
+            fi
+            if test "$want_component" == "1" ; then
+                ompi_show_subtitle "MCA component $type:$m (no configure script)"
+
+                # Remove any possible sym link in the mca-dynamic tree
+            
+                rm -f src/dynamic-mca/$type/$m
+
+                # Now process the component
+
+                MCA_PROCESS_COMPONENT(1, 1, $type, $m)
+
+                # Note that the AM_CONDITIONAL for this component is set in
+                # config/mca_no_configure_components.m4 -- which is generated by
+                # autogen.sh because we cannot have a variable
+                # AM_CONDITIONAL name (which we need here).  Since
+                # autogen.sh knows the name that is necessary, it just
+                # generated the AM_CONDITIONAL directly.  Here, we fill in
+                # the variable that is used in that AM_CONDITIONAL.
+
+                if test "$compile_mode" = "dso"; then
+                    value=1
+                else
+                    value=0
+                fi
+                foo="BUILD_${type}_${m}_DSO=$value"
+                eval $foo
             fi
-            foo="BUILD_${type}_${m}_DSO=$value"
-            eval $foo
         fi
     done
 
@@ -185,23 +212,39 @@ for type in $found_types; do
 	FOUND=0
 	HAPPY=0
 	m="`basename $component`"
-	if test -d $component -a -x $component/configure -a \
-	    ! -f $component/.ompi_ignore; then
-            ompi_show_subtitle "MCA component $type:$m (need to configure)"
+        # build if:
+        # - there is no ompi_ignore file
+        # - there is an ompi_ignore, but there is an empty ompi_unignore
+        # - there is an ompi_ignore, but username is in ompi_unignore
+	if test -d $component -a -x $component/configure ; then
+            want_component=1
+            if test -f $srcdir/$component/.ompi_ignore ; then
+                want_component=0
+            fi
+            if test -f $srcdir/$component/.ompi_unignore ; then
+		if test ! -s $srcdir/$component/.ompi_unignore ; then
+                    want_component=1
+                elif test ! -z "`grep $USER $srcdir/$component/.ompi_unignore`" ; then
+                    want_component=1
+	        fi
+            fi
+            if test "$want_component" == "1" ; then
+                ompi_show_subtitle "MCA component $type:$m (need to configure)"
 
-	    # We found one!
+                # We found one!
 
-	    FOUND=1
+                FOUND=1
 
-	    # Remove any possible sym link in the mca-dynamic tree
+                # Remove any possible sym link in the mca-dynamic tree
 
-	    rm -f src/dyanmic-mca/$type/$m
+                rm -f src/dyanmic-mca/$type/$m
 
-            # Configure the component subdirectory
+                # Configure the component subdirectory
 
-            OMPI_CONFIG_SUBDIR([src/mca/$type/$m],
-				  [$ompi_subdir_args], 
-				  [HAPPY=1], [HAPPY=0])
+                OMPI_CONFIG_SUBDIR([src/mca/$type/$m],
+                                    [$ompi_subdir_args], 
+                                    [HAPPY=1], [HAPPY=0])
+            fi
 	fi
 
         # Process this component