From 41f59f4746fd8080520cd0ce8f9f3c2a7cbe6fcd Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 17 Jan 2008 11:21:15 +0000 Subject: [PATCH] Stefan Fiedler: firefox: use system nspr and nss libraries if available use png, zlib, jpeg libraries too if available nspr: add CORE flag [2007111909180028751] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8967 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/public/nspr/nspr.desc | 1 + package/x11/firefox/firefox.conf | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/package/public/nspr/nspr.desc b/package/public/nspr/nspr.desc index 2cd0cb6f5..1f285f6c3 100644 --- a/package/public/nspr/nspr.desc +++ b/package/public/nspr/nspr.desc @@ -41,6 +41,7 @@ [M] The ROCK Linux Project [C] extra/development +[F] CORE [L] MPL [S] Stable diff --git a/package/x11/firefox/firefox.conf b/package/x11/firefox/firefox.conf index adb96a875..439c7de89 100644 --- a/package/x11/firefox/firefox.conf +++ b/package/x11/firefox/firefox.conf @@ -30,6 +30,12 @@ var_append extraconfopt " " '--enable-canvas' var_append extraconfopt " " '--enable-mathml' var_append extraconfopt " " '--enable-svg' +pkginstalled libjpeg && var_append extraconfopt " " '--with-system-jpeg' +pkginstalled zlib && var_append extraconfopt " " '--with-system-zlib' +pkginstalled libpng && var_append extraconfopt " " '--with-system-png' +pkginstalled nspr && var_append extraconfopt ' ' '--with-system-nspr --with-system-nss' + +pkginstalled pango && var_append extraconfopt ' ' '--enable-pango' pkginstalled cairo && var_append extraconfopt " " '--enable-system-cairo' # We need to recreate configure after gnome-linkage.patch is applied.