1 --- libpng-1.2.12/ltmain.sh.orig 2006-06-05 09:12:42.000000000 -0600
2 +++ libpng-1.2.12/ltmain.sh 2007-01-13 14:39:14.000000000 -0700
4 # line option must be used.
5 if test -z "$tagname"; then
6 $echo "$modename: unable to infer tagged configuration"
7 - $echo "$modename: specify a tag with \`--tag'" 1>&2
9 + $echo "$modename: defaulting to \`CC'"
10 + $echo "$modename: if this is not correct, specify a tag with \`--tag'"
13 # $echo "$modename: using $tagname tagged configuration"
15 @@ -2453,8 +2454,14 @@
21 + # Adding 'libdir' from the .la file to our library search paths
22 + # breaks crosscompilation horribly. We cheat here and don't add
23 + # it, instead adding the path where we found the .la. -CL
30 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
32 @@ -2935,6 +2942,16 @@
34 if grep "^installed=no" $deplib > /dev/null; then
35 path="$absdir/$objdir"
36 +# This interferes with crosscompilation. -CL
38 +# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
39 +# if test -z "$libdir"; then
40 +# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
43 +# if test "$absdir" != "$libdir"; then
44 +# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
47 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
48 if test -z "$libdir"; then
49 @@ -5659,6 +5676,10 @@
50 # Replace all uninstalled libtool libraries with the installed ones
52 for deplib in $dependency_libs; do
53 + # Replacing uninstalled with installed can easily break crosscompilation,
54 + # since the installed path is generally the wrong architecture. -CL
55 + newdependency_libs="$newdependency_libs $deplib"
59 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
60 @@ -6028,10 +6049,13 @@
61 # At present, this check doesn't affect windows .dll's that
62 # are installed into $libdir/../bin (currently, that works fine)
63 # but it's something to keep an eye on.
64 - if test "$inst_prefix_dir" = "$destdir"; then
65 - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
69 + # This breaks install into our staging area. -PB
71 + # if test "$inst_prefix_dir" = "$destdir"; then
72 + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
73 + # exit $EXIT_FAILURE
76 if test -n "$inst_prefix_dir"; then
77 # Stick the inst_prefix_dir data into the link command.