Magellan Linux

Contents of /trunk/apr-util/patches/apr-util-1.2.8-multilib-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 422 - (show annotations) (download)
Sat Nov 17 15:02:26 2007 UTC (16 years, 5 months ago) by niro
File size: 591 byte(s)
-fixed the multilib patch

1 diff -Naur apr-util-1.2.8/build/apu-conf.m4 apr-util-1.2.8-multilib/build/apu-conf.m4
2 --- apr-util-1.2.8/build/apu-conf.m4 2006-02-04 03:24:20.000000000 +0100
3 +++ apr-util-1.2.8-multilib/build/apu-conf.m4 2007-11-17 16:09:14.000000000 +0100
4 @@ -64,7 +64,8 @@
5 expat_libs="-lexpat"
6 expat_libtool="$1/lib/libexpat.la"
7 elif test -r "$1/include/expat.h" -a \
8 - -r "$1/lib/libexpat.la"; then
9 + -r "$1/lib/libexpat.la" -a \
10 + ! -r "$1/lib64/libexpat.la"; then
11 dnl Expat 1.95.* installation (with libtool)
12 expat_include_dir="$1/include"
13 expat_ldflags="-L$1/lib"