From faedb01ec50485a0af01cc86c69018e1e301122e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 16 Nov 2004 13:06:43 +0000 Subject: [PATCH] 2004-11-16 Owen Taylor * builds/unix/freetype-config.in: Supress -L$libdir for /usr/lib64 as well as /usr/lib. (Reported by Dan Winship - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=139199) --- ChangeLog | 6 ++++++ builds/unix/freetype-config.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93090c4f7..0be4a7817 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-16 Owen Taylor + + * builds/unix/freetype-config.in: Supress -L$libdir for + /usr/lib64 as well as /usr/lib. (Reported by Dan Winship - + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=139199) + 2004-11-11 Werner Lemberg * src/cff/cffdrivr.c (cff_service_ps_info): Updated. diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index 9a6ae100d..d92a877a5 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -119,7 +119,7 @@ if test "$echo_libs" = "yes" ; then eval "rpath=\"$hardcode_libdir_flag_spec\"" fi libs="-lfreetype @LIBZ@" - if test "$libdir" != "/usr/lib" ; then + if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then echo -L$libdir $rpath $libs else echo $libs