Regenerated.

1 files changed, 132 insertions, 55 deletions

diff --git a/tests/rpathy/configure b/tests/rpathy/configure
index 4319e71..97fccb6 100755
--- a/tests/rpathy/configure
+++ b/tests/rpathy/configure
@@ -5437,8 +5437,10 @@ if test "${with_librpathx_prefix+set}" = set; then
 fi
 
       LIBRPATHX=
+  LTLIBRPATHX=
   INCRPATHX=
   rpathdirs=
+  ltrpathdirs=
   names_already_handled=
   names_next_round='rpathx '
   while test -n "$names_next_round"; do
@@ -5459,29 +5461,9 @@ fi
         if test -n "$value"; then
           if test "$value" = yes; then
             eval value=\"\$LIB$uppername\"
-            
-  for element in $value; do
-    haveit=
-    for x in $LIBRPATHX; do
-      
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$element"
-    fi
-  done
-
+            test -z "$value" || LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$value"
           else
                                     :
           fi
@@ -5508,7 +5490,7 @@ fi
             fi
           fi
           if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LIBRPATHX; do
+            for x in $LDFLAGS $LTLIBRPATHX; do
               
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
@@ -5544,9 +5526,71 @@ fi
             done
           fi
           if test "X$found_dir" != "X"; then
-                                                
-                  LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
-            
+                        LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$hardcode_direct" = yes; then
+                                                      LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                                                            LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBRPATHX; do
+                      
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                                                                                        LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_a"
+              else
+                                                LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
+              fi
+            fi
                         additional_includedir=
             case "$found_dir" in
               */lib | */lib/)
@@ -5557,8 +5601,16 @@ fi
             if test "X$additional_includedir" != "X"; then
                                                                                                                 if test "X$additional_includedir" != "X/usr/include"; then
                 haveit=
-                for x in $CPPFLAGS $INCRPATHX; do
-                  
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux*) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCRPATHX; do
+                    
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5567,19 +5619,11 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-                  if test "X$x" = "X-I$additional_includedir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  if test "X$additional_includedir" = "X/usr/local/include"; then
-                    if test -n "$GCC"; then
-                      case $host_os in
-                        linux*) haveit=yes;;
-                      esac
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
                     fi
-                  fi
+                  done
                   if test -z "$haveit"; then
                     if test -d "$additional_includedir"; then
                                             INCRPATHX="${INCRPATHX}${INCRPATHX:+ }-I$additional_includedir"
@@ -5601,8 +5645,17 @@ fi
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
                                                                                                                                                                 if test "X$additional_libdir" != "X/usr/lib"; then
                       haveit=
-                      for x in $LDFLAGS $LIBRPATHX; do
-                        
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux*) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBRPATHX; do
+                          
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5611,24 +5664,37 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-                        if test "X$x" = "X-L$additional_libdir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        if test "X$additional_libdir" = "X/usr/local/lib"; then
-                          if test -n "$GCC"; then
-                            case $host_os in
-                              linux*) haveit=yes;;
-                            esac
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
                           fi
-                        fi
+                        done
                         if test -z "$haveit"; then
                           if test -d "$additional_libdir"; then
                                                         LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$additional_libdir"
                           fi
                         fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBRPATHX; do
+                          
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$additional_libdir"
+                          fi
+                        fi
                       fi
                     fi
                     ;;
@@ -5640,12 +5706,14 @@ fi
                     ;;
                   *)
                                         LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$dep"
+                    LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$dep"
                     ;;
                 esac
               done
             fi
           else
                                                             LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+            LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-l$name"
           fi
         fi
       fi
@@ -5672,14 +5740,21 @@ fi
       done
     fi
   fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-R$found_dir"
+    done
+  fi
 
     ac_cv_librpathx_libs="$LIBRPATHX"
+    ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
     ac_cv_librpathx_cppflags="$INCRPATHX"
   
 fi
 
 echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
   LIBRPATHX="$ac_cv_librpathx_libs"
+  LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
   INCRPATHX="$ac_cv_librpathx_cppflags"
   
   for element in $INCRPATHX; do
@@ -5705,6 +5780,7 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
   done
 
   
+  
       HAVE_LIBRPATHX=yes
   
   
@@ -5897,6 +5973,7 @@ s%@STRIP@%$STRIP%g
 s%@CPP@%$CPP%g
 s%@LIBTOOL@%$LIBTOOL%g
 s%@LIBRPATHX@%$LIBRPATHX%g
+s%@LTLIBRPATHX@%$LTLIBRPATHX%g
 s%@global_top_srcdir@%$global_top_srcdir%g
 
 CEOF