[Lunar-commits] r15179 - moonbase/trunk/web/firefox

[Moritz Heiber]

Author: moe
Date: 2005-05-31 09:33:38 +0000 (Tue, 31 May 2005)
New Revision: 15179

Modified:
   moonbase/trunk/web/firefox/BUILD
   moonbase/trunk/web/firefox/DEPENDS
Log:
Reordering the BUILD script .. much easier to read now. Trying to fix
the heimdal issue (still needs testing though). Trying to fix the
empty message box upon a "Do you want to save the form you just
filled in" .. still needs testing as well.



Modified: moonbase/trunk/web/firefox/BUILD
===================================================================
--- moonbase/trunk/web/firefox/BUILD	2005-05-31 04:18:16 UTC (rev 15178)
+++ moonbase/trunk/web/firefox/BUILD	2005-05-31 09:33:38 UTC (rev 15179)
@@ -5,45 +5,58 @@
   
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
   
-  OPTS="$OPTS --enable-strip --enable-strip-libs"
-  OPTS="$OPTS --enable-application=browser"
-  OPTS="$OPTS --with-system-zlib --with-system-png --with-system-jpeg"
-  OPTS="$OPTS --disable-mathml"
-  OPTS="$OPTS --disable-accessibility"
-  OPTS="$OPTS --disable-jsd"
-  OPTS="$OPTS --enable-xft --disable-freetype2"
-  OPTS="$OPTS --enable-xterm-updates"
-  OPTS="$OPTS --disable-ldap"
-  OPTS="$OPTS --enable-svg --enable-svg-renderer-cairo"
-  OPTS="$OPTS --enable-extensions=default,-irc,-typeaheadfind"
-  OPTS="$OPTS --enable-single-profile --disable-profilesharing" 
+  MOZ_EXTENSIONS="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector"
 
+  if in_depends gnome-vfs2 ; then
+	MOZ_EXTENSIONS="${MOZ_EXTENSIONS},gnomevfs"
+  fi &&
+
+  if in_depends heimdal ; then
+	MOZ_EXTENSIONS="${MOZ_EXTENSIONS},negotiateauth"
+  else
+	MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-negotiateauth"
+  fi &&
+
   export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
   export MOZ_PHOENIX=1
   export MOZILLA_OFFICIAL=1
   export BUILD_OFFICIAL=1
 
-  ./configure \
+  ./configure 		\
     --prefix=/usr	\
     --with-x            \
     --with-pthreads     \
+    --with-default-mozilla-five-home=$MOZILLA_HOME \
+    --with-user-appdir=".firefox"       \
+    --with-system-zlib	\
+    --with-system-png   \
+    --with-system-jpeg  \
+    --enable-extensions=${MOZ_EXTENSIONS}	\
+    --enable-xft	\
+    --enable-single-profile	\
+    --enable-application=browser	\
+    --enable-default-toolkit=gtk2       \
     --enable-reorder    \
     --enable-cpp-rtti   \
     --enable-optimize="$CFLAGS"   \
-    --with-default-mozilla-five-home=$MOZILLA_HOME \
+    --enable-crypto     \
+    --enable-strip	\
+    --enable-strip-libs \
+    --enable-xterm-updates	\
+    --enable-svg	\
+    --enable-svg-renderer-cairo	\
+    --enable-plaintext-editor-only	\
     --disable-debug     \
     --disable-tests     \
     --disable-installer \
     --disable-pedantic  \
     --disable-mailnews  \
     --disable-composer  \
-    --enable-crypto     \
-    --disable-static	\
     --disable-logging	\
-    --with-gtk2		\
-    --enable-default-toolkit=gtk2	\
-    --disable-toolkit-gtk	\
-    --with-user-appdir=".firefox"	\
+    --disable-accessibility	\
+    --disable-freetype2	\
+    --disable-ldap	\
+    --disable-profilesharing	\ 
     $OPTS               &&
               
     default_make	&&
@@ -53,7 +66,7 @@
     cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
     		/usr/include/firefox-$VERSION/nss &&
 
-    # Install the plugins in the right direction
+    # Install the plugins in the right directories
     mkdir -p /opt/lunar/plugins		&&
     for plugin in `ls /usr/lib/firefox-$VERSION/plugins`; do
 	 `install -m755 /usr/lib/firefox-$VERSION/plugins/$plugin /opt/lunar/plugins`; done  &&

Modified: moonbase/trunk/web/firefox/DEPENDS
===================================================================
--- moonbase/trunk/web/firefox/DEPENDS	2005-05-31 04:18:16 UTC (rev 15178)
+++ moonbase/trunk/web/firefox/DEPENDS	2005-05-31 09:33:38 UTC (rev 15179)
@@ -7,7 +7,7 @@
 depends cairo  &&
 
 optional_depends "flash-plugin" "" "" "to enable shockwave flash" &&
-optional_depends "gnome-vfs2" "" "--disable-gnomevfs" "for Gnome VFS support" &&
+optional_depends "gnome-vfs2" "" "" "for Gnome VFS support" &&
 optional_depends heimdal \
                  "--with-gssapi=/usr/include/heimdal" \
                  "" \