From efbeffb0cdcd1322ef47fb433767ef6f81e7a1a8 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Fri, 12 Dec 2014 13:45:46 +0200
Subject: Enable Haiku support in configure.in


diff --git a/mozilla/configure.in b/mozilla/configure.in
index 23cc7e7..9bd8cb5 100755
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then
         mingw*)         OS_ARCH=WINNT ;;
         wince*)         OS_ARCH=WINCE ;;
         darwin*)        OS_ARCH=Darwin OS_TARGET=Darwin ;;   
-        beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
-dnl -------------------------------------------------------
-dnl Cross-compiling-haiku - This should probably be 
-dnl        beos*)        OS_ARCH=BeOS OS_TARGET=BeOS ;;
-dnl        haiku*)       OS_ARCH=Haiku OS_TARGET=Haiku ;;
-dnl -------------------------------------------------------
+        beos*)          OS_ARCH=BeOS OS_TARGET=BeOS ;;
+        haiku*)         OS_ARCH=Haiku OS_TARGET=Haiku ;;
     esac
 else
     OS_TARGET=`uname -s`
-- 
2.2.2


From f5292ed6041e2642a85aa086355f11102ca8c659 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 19 Apr 2015 20:59:27 +0300
Subject: mozconfig clean-up


diff --git a/supporting-files/mozilla-configs/browser.mozconfig b/supporting-files/mozilla-configs/browser.mozconfig
index 43bac3b..fd639b6 100644
--- a/supporting-files/mozilla-configs/browser.mozconfig
+++ b/supporting-files/mozilla-configs/browser.mozconfig
@@ -4,6 +4,8 @@

 . $topsrcdir/browser/config/mozconfig
 mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_APP_DISPLAYNAME=BeZilla
+mk_add_options MOZ_LIBDIR=$prefix/BeZilla

 # Required to download the right version of the source code
 mk_add_options MOZ_CO_TAG=MOZILLA_1_8_BRANCH
@@ -13,19 +15,11 @@ mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot

 # -----------------------------------------------------
 # --- EDIT THESE VALUES TO REFLECT YOUR LOCAL BUILD ---
-export GLIB_CONFIG=/boot/common/bin/glib-config
-mk_add_options GLIB_CONFIG=/boot/common/bin/glib-config
-
-export LIBIDL_CONFIG=/boot/common/bin/libIDL-config
-mk_add_options LIBIDL_CONFIG=/boot/common/bin/libIDL-config

 # --- Set the outputdir for the build ---
 mk_add_options MOZ_OBJDIR=/moz_obj/browser

-# autoconf 2.13 was built by
-#./configure --prefix=/boot/common/autoconf-2.13 --program-suffix=-2.13 --bindir=/boot/common/bin/
-# make && make install
-export AUTOCONF='/boot/common/bin/autoconf-2.13 -m /boot/common/autoconf-2.13/share/autoconf'
+export AUTOCONF='autoconf-2.13'
 # -----------------------------------------------------

 # Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
@@ -40,7 +34,7 @@ ac_add_options --disable-canvas

 # Utilize Haiku's default shared libraries
 ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
+ac_add_options --with-system-png
 ac_add_options --with-system-zlib

 ac_add_options --enable-nspr-threads
@@ -62,6 +56,7 @@ ac_add_options --enable-static --disable-shared
 ac_add_options --enable-strip
 ac_add_options --enable-reorder
 ac_add_options --enable-js-static-build
+ac_add_options --disable-debug
 #ac_add_options --enable-elf-dynstr-gc # doesn't build in gcc2.  gcc4 untested.

 # ----------------------------------------------------------------------------
--
2.2.2

