diff options
| -rw-r--r-- | application/palemoon/moz.configure | 44 | ||||
| -rw-r--r-- | old-configure.in | 4 |
2 files changed, 2 insertions, 46 deletions
diff --git a/application/palemoon/moz.configure b/application/palemoon/moz.configure index 30ad4bfe5..de9b10b16 100644 --- a/application/palemoon/moz.configure +++ b/application/palemoon/moz.configure @@ -6,48 +6,4 @@ include('../../toolkit/moz.configure') -# configure.in is unreliable on Solaris. The build system only picks up about -# half the boolean values defined there. Doing this instead -# works consistently. Most of the ones that use AC_DEFINE without a -# MOZ_ARG_BOOL in this directory's configure.in fail, but all the ones in -# old-configure.in work just fine and say there's a duplicate if I try and -# define them here. - -if target_is_solaris: - - set_define('HAVE_SIDEBAR', True) - set_config('HAVE_SIDEBAR', True) - - set_define('MC_PALEMOON', True) - set_config('MC_PALEMOON', True) - - set_define('MOZ_PHOENIX', True) - set_config('MOZ_PHOENIX', True) - - set_define('MOZ_PERSONAS', True) - set_config('MOZ_PERSONAS', True) - -# set_define('MOZ_DEVTOOLS', True) -# set_config('MOZ_DEVTOOLS', True) - - set_define('MOZ_PHOENIX_EXTENSIONS', True) - set_config('MOZ_PHOENIX_EXTENSIONS', True) - - set_define('MOZ_SERVICES_COMMON', True) - set_config('MOZ_SERVICES_COMMON', True) - -# set_define('MOZ_SERVICES_SYNC', True) -# set_config('MOZ_SERVICES_SYNC', True) - -# set_define('MOZ_JSDOWNLOADS', True) -# set_config('MOZ_JSDOWNLOADS', True) - -# set_define('MOZ_WEBGL_CONFORMANT', True) -# set_config('MOZ_WEBGL_CONFORMANT', True) - -# set_define('MOZ_ADDON_SIGNING', False) -# set_config('MOZ_ADDON_SIGNING', False) - -# set_define('MOZ_REQUIRE_SIGNING', False) -# set_config('MOZ_REQUIRE_SIGNING', False) diff --git a/old-configure.in b/old-configure.in index c5b4f1efb..253084216 100644 --- a/old-configure.in +++ b/old-configure.in @@ -761,7 +761,7 @@ case "$host" in HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; - + *) HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" @@ -4146,7 +4146,7 @@ if test -f "${srcdir}/${MOZ_BUILD_APP}/configure.in" ; then _subconfigure_config_args="$ac_configure_args" } tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1 - m4 "${srcdir}/build/autoconf/subconfigure.m4" \ + ${TOOLCHAIN_PREFIX}m4 "${srcdir}/build/autoconf/subconfigure.m4" \ "${srcdir}/build/autoconf/altoptions.m4" \ "${srcdir}/${MOZ_BUILD_APP}/configure.in" > $tmpscript . $tmpscript |