From a7ba6e7b9942093bfc6534ea923ee6e85eed3030 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 25 Nov 2005 17:20:39 +0000 Subject: [PATCH] Stefan Fiedler: mozilla: copy freetype, gcc-4.0, MOZ_PLUGIN_DIR patches from T2 use --libdir option, enable freetype2, use system zlib, libjpeg, libmng, libpng if available Index: package/x11/mozilla/mozilla.conf =================================================================== [2005102619083914436] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6635 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/mozilla/mozilla.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/x11/mozilla/mozilla.conf b/package/x11/mozilla/mozilla.conf index 76a7bf200..8557545e5 100644 --- a/package/x11/mozilla/mozilla.conf +++ b/package/x11/mozilla/mozilla.conf @@ -40,7 +40,7 @@ moz_implant_version() { } moz_configure() { - cat >> .mozconfig <<-EOT + cat >> .mozconfig <<-EOT # sh # Build configuration script # Options for client.mk. @@ -48,6 +48,7 @@ moz_configure() { # Options for 'configure' (same as command-line options). ac_add_options --prefix=$root/$prefix +ac_add_options --libdir=$root/$libdir ac_add_options --sysconfdir=$root/etc/$pkg ac_add_options --localstatedir=$root/var ac_add_options --host=$arch_target @@ -57,13 +58,16 @@ ac_add_options --disable-dtd-debug ac_add_options --disable-tests ac_add_options --disable-pedantic ac_add_options --enable-xft -ac_add_options --disable-freetype2 ac_add_options --enable-default-toolkit=gtk2 export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 EOT +for lib in zlib libjpeg libpng libmng ; do + pkginstalled $lib && echo ac_add_options --with-system-${lib#lib} >> .mozconfig +done + } moz_build() {