Refs trac:4038

Revert r30096 and use better precious variable names.

This commit was SVN r30132.

The following SVN revision numbers were found above:
  r30096 --> open-mpi/ompi@e0f6a4ef47

The following Trac tickets were found above:
  Ticket 4038 --> https://svn.open-mpi.org/trac/ompi/ticket/4038

autogen.pl

@@ -970,9 +970,6 @@ sub patch_autotools_output {
     verbose "$indent_str"."Patching configure for IBM xlf libtool bug\n";
     $c =~ s/(\$LD -shared \$libobjs \$deplibs \$)compiler_flags( -soname \$soname)/$1linker_flags$2/g;
 
-    verbose "$indent_str"."Patching configure for Libtool setting of dir variable\n";
-    $c =~ s/( +)(ECHO="\$dir\/echo")/\1\2\n\1unset dir/;
-
     open(OUT, ">configure.patched") || my_die "Can't open configure.patched";
     print OUT $c;
     close(OUT);

opal/mca/hwloc/configure.m4

@@ -120,22 +120,22 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
         # Otherwise, if we try to AC RUN_IFELSE anything here in
         # configure, it might die because it can't find the libraries
         # we just linked against.
-        OPAL_VAR_SCOPE_PUSH([found_l token tmp dir])
-        found_l=0
-        eval "tmp=\$opal_hwloc_${opal_hwloc_winner}_ADD_LIBS"
-        for token in $tmp; do
-            case $token in
-            -l*) found_l=1 ;;
+        OPAL_VAR_SCOPE_PUSH([opal_hwloc_base_found_l opal_hwloc_base_token opal_hwloc_base_tmp opal_hwloc_base_dir])
+        opal_hwloc_base_found_l=0
+        eval "opal_hwloc_base_tmp=\$opal_hwloc_${opal_hwloc_winner}_ADD_LIBS"
+        for opal_hwloc_base_token in $opal_hwloc_base_tmp; do
+            case $opal_hwloc_base_token in
+            -l*) opal_hwloc_base_found_l=1 ;;
             esac
         done
-        AS_IF([test $found_l -eq 1],
-              [eval "tmp=\$opal_hwloc_${opal_hwloc_winner}_ADD_LDFLAGS"
-               for token in $tmp; do
-                   case $token in
+        AS_IF([test $opal_hwloc_base_found_l -eq 1],
+              [eval "opal_hwloc_base_tmp=\$opal_hwloc_${opal_hwloc_winner}_ADD_LDFLAGS"
+               for opal_hwloc_base_token in $opal_hwloc_base_tmp; do
+                   case $opal_hwloc_base_token in
                    -L*)
-                       dir=`echo $token | cut -c3-`
-                       export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir
-                       AC_MSG_WARN([Adding to LD_LIBRARY_PATH: $dir])
+                       opal_hwloc_base_dir=`echo $opal_hwloc_base_token | cut -c3-`
+                       export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$opal_hwloc_base_dir
+                       AC_MSG_WARN([Adding to LD_LIBRARY_PATH: $opal_hwloc_base_dir])
                        ;;
                    esac
                done])