templates/libtool-fix-ltmain.sh.diff

   1 --- libltdl/config/ltmain.m4sh.orig     2008-09-07 17:54:53.000000000 +0000
   2 +++ libltdl/config/ltmain.m4sh  2008-09-28 04:35:05.000000000 +0000
   3 @@ -1576,8 +1576,8 @@
   4           # At present, this check doesn't affect windows .dll's that
   5           # are installed into $libdir/../bin (currently, that works fine)
   6           # but it's something to keep an eye on.
   7 -         test "$inst_prefix_dir" = "$destdir" && \
   8 -           func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
   9 +         #test "$inst_prefix_dir" = "$destdir" && \
  10 +         #  func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
  11
  12           if test -n "$inst_prefix_dir"; then
  13             # Stick the inst_prefix_dir data into the link command.
  14 @@ -5275,7 +5275,7 @@
  15                 if test -n "$inst_prefix_dir"; then
  16                   case $libdir in
  17                     [\\/]*)
  18 -                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
  19 +                     add_dir="$add_dir -L$inst_prefix_dir"
  20                       ;;
  21                   esac
  22                 fi
  23 @@ -5336,8 +5336,8 @@
  24               add="-l$name"
  25             elif test "$hardcode_automatic" = yes; then
  26               if test -n "$inst_prefix_dir" &&
  27 -                test -f "$inst_prefix_dir$libdir/$linklib" ; then
  28 -               add="$inst_prefix_dir$libdir/$linklib"
  29 +                test -f "$inst_prefix_dir" ; then
  30 +               add="$inst_prefix_dir"
  31               else
  32                 add="$libdir/$linklib"
  33               fi
  34 @@ -5348,7 +5348,7 @@
  35               if test -n "$inst_prefix_dir"; then
  36                 case $libdir in
  37                   [\\/]*)
  38 -                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
  39 +                   add_dir="$add_dir -L$inst_prefix_dir"
  40                     ;;
  41                 esac
  42               fi
  43 --- libltdl/config/ltmain.sh.orig       2008-09-07 19:56:33.000000000 +0200
  44 +++ libltdl/config/ltmain.sh    2008-10-06 04:21:18.000000000 +0200
  45 @@ -2018,8 +2018,8 @@
  46           # At present, this check doesn't affect windows .dll's that
  47           # are installed into $libdir/../bin (currently, that works fine)
  48           # but it's something to keep an eye on.
  49 -         test "$inst_prefix_dir" = "$destdir" && \
  50 -           func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
  51 +         #test "$inst_prefix_dir" = "$destdir" && \
  52 +         #  func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
  53
  54           if test -n "$inst_prefix_dir"; then
  55             # Stick the inst_prefix_dir data into the link command.
  56 @@ -5115,7 +5115,7 @@
  57               finalize_deplibs="$deplib $finalize_deplibs"
  58             else
  59               deplibs="$deplib $deplibs"
  60 -             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
  61 +             test "$linkmode" = lib && newdependency_libs="$newdependency_libs"
  62             fi
  63             continue
  64           else # deplib is a libtool library
  65 @@ -5141,7 +5141,7 @@
  66                       finalize_deplibs="$deplib $finalize_deplibs"
  67                     else
  68                       deplibs="$deplib $deplibs"
  69 -                     test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
  70 +                     test "$linkmode" = lib && newdependency_libs="$newdependency_libs"
  71                     fi
  72                     continue
  73                   fi
  74 @@ -5172,7 +5172,7 @@
  75           lib)
  76             deplibs="$deplib $deplibs"
  77             test "$pass" = conv && continue
  78 -           newdependency_libs="$deplib $newdependency_libs"
  79 +           newdependency_libs="$newdependency_libs"
  80             func_stripname '-L' '' "$deplib"
  81             newlib_search_path="$newlib_search_path $func_stripname_result"
  82             ;;
  83 @@ -5490,7 +5490,7 @@
  84             else
  85               # Need to hardcode shared library paths
  86               # or/and link against static libraries
  87 -             newdependency_libs="$deplib $newdependency_libs"
  88 +             newdependency_libs="$newdependency_libs"
  89             fi
  90             if $opt_duplicate_deps ; then
  91               case "$tmp_libs " in
  92 @@ -5717,7 +5717,7 @@
  93                 if test -n "$inst_prefix_dir"; then
  94                   case $libdir in
  95                     [\\/]*)
  96 -                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
  97 +                     add_dir="$add_dir -L$inst_prefix_dir"
  98                       ;;
  99                   esac
 100                 fi
 101 @@ -5778,8 +5778,8 @@
 102               add="-l$name"
 103             elif test "$hardcode_automatic" = yes; then
 104               if test -n "$inst_prefix_dir" &&
 105 -                test -f "$inst_prefix_dir$libdir/$linklib" ; then
 106 -               add="$inst_prefix_dir$libdir/$linklib"
 107 +                test -f "$inst_prefix_dir" ; then
 108 +               add="$inst_prefix_dir"
 109               else
 110                 add="$libdir/$linklib"
 111               fi
 112 @@ -5790,7 +5790,7 @@
 113               if test -n "$inst_prefix_dir"; then
 114                 case $libdir in
 115                   [\\/]*)
 116 -                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
 117 +                   add_dir="$add_dir -L$inst_prefix_dir"
 118                     ;;
 119                 esac
 120               fi
 121 @@ -5881,7 +5881,7 @@
 122           # ... and its dependency_libs
 123           tmp_libs=
 124           for deplib in $dependency_libs; do
 125 -           newdependency_libs="$deplib $newdependency_libs"
 126 +           newdependency_libs="$newdependency_libs"
 127             if $opt_duplicate_deps ; then
 128               case "$tmp_libs " in
 129               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 130 @@ -6449,7 +6449,7 @@
 131           esac
 132         done
 133         if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
 134 -         dependency_libs="$temp_xrpath $dependency_libs"
 135 +         dependency_libs="$dependency_libs"
 136         fi
 137        fi
 138