diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/old-configure.in b/old-configure.in index 511f40653..7d336d37f 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2109,7 +2109,7 @@ MOZ_ARG_WITH_BOOL(system-nss, _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_SYSTEM_NSS"; then @@ -2256,6 +2256,7 @@ dnl ======================================================== MOZ_ARG_HEADER(Application) +ENABLE_TESTS= ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= @@ -3794,6 +3795,32 @@ if test -n "$MOZ_UPDATER"; then fi dnl ======================================================== +dnl Build the tests? +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(tests, +[ --enable-tests Build test libraries & programs], + ENABLE_TESTS=1, + ENABLE_TESTS= ) + +if test -n "$ENABLE_TESTS"; then + GTEST_HAS_RTTI=0 + AC_DEFINE(ENABLE_TESTS) + AC_DEFINE_UNQUOTED(GTEST_HAS_RTTI, 0) + AC_SUBST(GTEST_HAS_RTTI) + if test -n "$_WIN32_MSVC"; then + AC_DEFINE_UNQUOTED(_VARIADIC_MAX, 10) + fi + if test "${OS_TARGET}" = "Android"; then + AC_DEFINE(GTEST_OS_LINUX_ANDROID) + AC_DEFINE(GTEST_USE_OWN_TR1_TUPLE) + AC_DEFINE_UNQUOTED(GTEST_HAS_CLONE, 0) + AC_SUBST(GTEST_OS_LINUX_ANDROID) + AC_SUBST(GTEST_USE_OWN_TR1_TUPLE) + AC_SUBST(GTEST_HAS_CLONE) + fi +fi + +dnl ======================================================== dnl parental controls (for Windows Vista) dnl ======================================================== MOZ_ARG_DISABLE_BOOL(parental-controls, @@ -4262,8 +4289,6 @@ Android|WINNT|Darwin) esac if test -n "$MOZ_REPLACE_MALLOC"; then - MOZ_SYSTEM_JEMALLOC= - dnl Replace-malloc Mac linkage quirks if test -n "$MACOSX_DEPLOYMENT_TARGET"; then AC_CACHE_CHECK([how to do weak dynamic linking], @@ -4330,15 +4355,6 @@ if test -z "$MOZ_MEMORY"; then ;; esac else - if test -n "$MOZ_JEMALLOC4" -a -z "$MOZ_REPLACE_MALLOC"; then - MOZ_SYSTEM_JEMALLOC=1 - AC_CHECK_FUNCS(mallctl nallocx,, - [MOZ_SYSTEM_JEMALLOC= - break]) - if test -n "$MOZ_SYSTEM_JEMALLOC"; then - AC_DEFINE(MOZ_SYSTEM_JEMALLOC) - fi - fi if test "x$MOZ_DEBUG" = "x1"; then AC_DEFINE(MOZ_MEMORY_DEBUG) fi @@ -4351,7 +4367,6 @@ else ;; esac fi # MOZ_MEMORY -AC_SUBST(MOZ_SYSTEM_JEMALLOC) AC_SUBST(MOZ_GLUE_IN_PROGRAM) # Allow the application to provide a subconfigure script. @@ -5257,6 +5272,8 @@ AC_SUBST(LIBICONV) AC_SUBST(MOZ_TOOLKIT_SEARCH) AC_SUBST(MOZ_FEEDS) +AC_SUBST(ENABLE_TESTS) + AC_SUBST(MOZ_UNIVERSALCHARDET) AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_SPELLCHECK) @@ -5832,10 +5849,6 @@ AC_SUBST(NSS_DISABLE_LIBPKIX) MOZ_CREATE_CONFIG_STATUS() -if test "$COMPILE_ENVIRONMENT"; then - MOZ_SUBCONFIGURE_JEMALLOC() -fi - # Run freetype configure script if test "$MOZ_TREE_FREETYPE"; then |