зеркало из https://github.com/mozilla/gecko-dev.git
Approved by leaf.
Removed --enable-random-options and --enable-cross-compile options. Set CROSS_COMPILE in the environment if you want to use the cross-compiling setup for now. Gave into my pedantic side and cleaned up the help messages so that the output from --help actually looks reasonable. For the curious, they are lined up on column 27. Marked --disable-client-wallet & --disable-cookie-management as broken.
This commit is contained in:
cls%seawood.org
Родитель
8b02e4c762
Коммит
d09f12c8b2
|
|
@ -9,11 +9,12 @@ AC_DEFUN(AM_PATH_GLIB,
|
|||
[dnl
|
||||
dnl Get the cflags and libraries from the glib-config script
|
||||
dnl
|
||||
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
|
||||
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
|
||||
glib_config_prefix="$withval", glib_config_prefix="")
|
||||
AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
|
||||
AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX
|
||||
Exec prefix where GLIB is installed (optional)],
|
||||
glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
|
||||
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
|
||||
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
|
||||
, enable_glibtest=yes)
|
||||
|
||||
if test x$glib_config_exec_prefix != x ; then
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ dnl Get the cflags and libraries from the gtk-config script
|
|||
dnl
|
||||
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
|
||||
gtk_config_prefix="$withval", gtk_config_prefix="")
|
||||
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
|
||||
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX
|
||||
Exec prefix where GTK is installed (optional)],
|
||||
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
|
||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
|
||||
, enable_gtktest=yes)
|
||||
|
|
|
|||
|
|
@ -7,11 +7,13 @@ AC_DEFUN(AM_PATH_LIBIDL,
|
|||
[dnl
|
||||
dnl Get the cflags and libraries from the libIDL-config script
|
||||
dnl
|
||||
AC_ARG_WITH(libIDL-prefix,[ --with-libIDL-prefix=PFX Prefix where libIDL is installed (optional)],
|
||||
AC_ARG_WITH(libIDL-prefix,[ --with-libIDL-prefix=PFX
|
||||
Prefix where libIDL is installed (optional)],
|
||||
libIDL_config_prefix="$withval", libIDL_config_prefix="")
|
||||
AC_ARG_WITH(libIDL-exec-prefix,[ --with-libIDL-exec-prefix=PFX Exec prefix where libIDL is installed (optional)],
|
||||
AC_ARG_WITH(libIDL-exec-prefix,[ --with-libIDL-exec-prefix=PFX
|
||||
Exec prefix where libIDL is installed (optional)],
|
||||
libIDL_config_exec_prefix="$withval", libIDL_config_exec_prefix="")
|
||||
AC_ARG_ENABLE(libIDLtest, [ --disable-libIDLtest Do not try to compile and run a test libIDL program],
|
||||
AC_ARG_ENABLE(libIDLtest, [ --disable-libIDLtest Do not try to compile and run a test libIDL program],
|
||||
, enable_libIDLtest=yes)
|
||||
|
||||
if test x$libIDL_config_exec_prefix != x ; then
|
||||
|
|
|
|||
187
configure.in
187
configure.in
|
|
@ -34,98 +34,6 @@ AC_INIT(config/config.mk)
|
|||
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_PREFIX_DEFAULT(`pwd`/dist)
|
||||
dnl ========================================================
|
||||
dnl Pick an option...any option.
|
||||
dnl Caveat: random options will override cmdline options.
|
||||
dnl ========================================================
|
||||
AC_ARG_ENABLE(random-options,
|
||||
[ --enable-random-options Randomly add options to configure],
|
||||
[if test "$enableval" = "yes"; then
|
||||
if test -z $BASH_VERSION; then
|
||||
AC_MSG_WARN("Options randomizer requires GNU bash.");
|
||||
else
|
||||
AC_MSG_CHECKING([for random options]);
|
||||
changequote(, )dnl
|
||||
_nargs=$[RANDOM % 5 + 1] ;
|
||||
_new_args=
|
||||
while test 1; do
|
||||
_choice=$[RANDOM % 25 + 1];
|
||||
case "$_choice" in
|
||||
1) _new_args="$_new_args --with-gtk" ;;
|
||||
2) _new_args="$_new_args --with-gtk --with-static-gtk" ;;
|
||||
3) _new_args="$_new_args --disable-gtk-mozilla" ;;
|
||||
4) _new_args="$_new_args --with-motif" ;;
|
||||
5) _new_args="$_new_args --with-motif --with-static-motif" ;;
|
||||
6) _new_args="$_new_args --with-xlib" ;;
|
||||
7) _new_args="$_new_args --with-qt" ;;
|
||||
8) _new_args="$_new_args --with-qt --with-static-qt" ;;
|
||||
9) _new_args="$_new_args --enable-idlc" ;;
|
||||
10) _new_args="$_new_args --disable-async-dns" ;;
|
||||
11) _new_args="$_new_args --enable-oji" ;;
|
||||
12) _new_args="$_new_args --enable-pics" ;;
|
||||
13) _new_args="$_new_args --enable-brprof" ;;
|
||||
14) _new_args="$_new_args --enable-x11-shm" ;;
|
||||
15) _new_args="$_new_args --enable-monolithic-toolkit" ;;
|
||||
16) _new_args="$_new_args --disable-pic-dso-cflags" ;;
|
||||
17) _new_args="$_new_args --disable-client-wallet" ;;
|
||||
18) _new_args="$_new_args --disable-cookie-management" ;;
|
||||
19) _new_args="$_new_args --disable-single-signon" ;;
|
||||
20) _new_args="$_new_args --enable-strip-libs" ;;
|
||||
21) _new_args="$_new_args --disable-dtd-debug" ;;
|
||||
22) _new_args="$_new_args --enable-cpp-rtti" ;;
|
||||
23) _new_args="$_new_args --enable-cpp-excecpions" ;;
|
||||
24) _new_args="$_new_args --disable-double-buffer" ;;
|
||||
25) _new_args="$_new_args --enable-static" ;;
|
||||
esac
|
||||
|
||||
_nargs=$[_nargs - 1];
|
||||
if test $_nargs -lt 0; then
|
||||
break;
|
||||
fi
|
||||
done
|
||||
changequote([, ])dnl
|
||||
|
||||
for _ac_option in $_new_args; do
|
||||
case "$_ac_option" in
|
||||
-disable-* | --disable-*)
|
||||
_ac_feature=`echo $_ac_option|sed -e 's/-*disable-//'`
|
||||
_ac_feature=`echo $_ac_feature| sed 's/-/_/g'`
|
||||
eval "enable_${_ac_feature}=no"
|
||||
;;
|
||||
-enable-* | --enable-*)
|
||||
_ac_feature=`echo $_ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
|
||||
_ac_feature=`echo $_ac_feature| sed 's/-/_/g'`
|
||||
eval "enable_${_ac_feature}=yes"
|
||||
;;
|
||||
-with-* | --with-*)
|
||||
_ac_package=`echo $_ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
|
||||
_ac_package=`echo $_ac_package| sed 's/-/_/g'`
|
||||
eval "with_${_ac_package}=yes"
|
||||
;;
|
||||
-without-* | --without-*)
|
||||
_ac_package=`echo $_ac_option|sed -e 's/-*without-//'`
|
||||
_ac_package=`echo $_ac_package| sed 's/-/_/g'`
|
||||
eval "with_${_ac_package}=no"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
AC_MSG_RESULT([$_new_args]);
|
||||
|
||||
ac_configure_args=`echo $ac_configure_args | sed 's/--enable-random-options//'`
|
||||
ac_configure_args="$ac_configure_args $_new_args";
|
||||
|
||||
fi
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(cross-compile,
|
||||
[ --enable-cross-compile Turn on autodetection of cross-compile tools],
|
||||
[if test "$enableval" = "yes"; then
|
||||
CROSS_COMPILE=1
|
||||
else
|
||||
CROSS_COMPILE=
|
||||
fi], CROSS_COMPILE=)
|
||||
|
||||
TARGET_CPU="${target_cpu}"
|
||||
TARGET_OS="${target_os}"
|
||||
|
||||
|
|
@ -222,6 +130,9 @@ MOZ_BUILD_ROOT=`pwd`
|
|||
dnl ========================================================
|
||||
dnl Checks for compilers.
|
||||
dnl ========================================================
|
||||
dnl Set CROSS_COMPILE in the environment when running configure
|
||||
dnl to use the cross-compile setup for now
|
||||
dnl ========================================================
|
||||
if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
|
||||
echo "cross compiling from $host to $target"
|
||||
cross_compiling=yes
|
||||
|
|
@ -1003,7 +914,7 @@ dnl ========================================================
|
|||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(gtk,
|
||||
[ --with-gtk Enable GTK+ support ],
|
||||
[ --with-gtk Enable GTK+ support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
|
|
@ -1030,7 +941,7 @@ then
|
|||
MOZ_GLE_LDFLAGS=
|
||||
|
||||
AC_ARG_WITH(gle,
|
||||
[ --with-gle GLE support (for debugging gtk widgets) ],
|
||||
[ --with-gle GLE support (for debugging gtk widgets) ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
|
|
@ -1044,7 +955,7 @@ then
|
|||
])
|
||||
|
||||
AC_ARG_WITH(static-gtk,
|
||||
[ --with-static-gtk link gtk statically if possible],
|
||||
[ --with-static-gtk Link GTK statically if possible],
|
||||
sysstaticgtk=$withval)
|
||||
|
||||
if test "$sysstaticgtk" != "yes"
|
||||
|
|
@ -1119,7 +1030,7 @@ dnl ========================================================
|
|||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(motif,
|
||||
[ --with-motif Enable Motif support ],
|
||||
[ --with-motif Enable Motif support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
|
|
@ -1205,7 +1116,7 @@ dnl MOTIF_REQUIRES_XPM=`${detect_motif} -xpm`
|
|||
MOZ_MOTIF_LDFLAGS="$MOTIF_XP_LIBS $MOZ_MOTIF_LDFLAGS $X_LIBS $XT_LIBS $XMU_LIBS $XPM_LIBS $XEXT_LIBS $X11_LIBS $XSM_LIBS $XICE_LIBS"
|
||||
|
||||
AC_ARG_WITH(static-motif,
|
||||
[ --with-static-motif link Motif statically if possible],
|
||||
[ --with-static-motif Link Motif statically if possible],
|
||||
sysstaticmotif=$withval)
|
||||
|
||||
if test "$sysstaticmotif" != "yes"; then
|
||||
|
|
@ -1242,7 +1153,7 @@ dnl ========================================================
|
|||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(xlib,
|
||||
[ --with-xlib Enable xlib support ],
|
||||
[ --with-xlib Enable xlib support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
|
|
@ -1279,7 +1190,7 @@ dnl ========================================================
|
|||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(qt,
|
||||
[ --with-qt Enable Qt support ],
|
||||
[ --with-qt Enable Qt support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
|
|
@ -1293,7 +1204,7 @@ fi
|
|||
if test "$MOZ_ENABLE_QT"
|
||||
then
|
||||
AC_ARG_WITH(qtdir,
|
||||
[ --with-qtdir Specify Qt directory ],
|
||||
[ --with-qtdir=\$dir Specify Qt directory ],
|
||||
[ QTDIR=$withval],
|
||||
[ QTDIR="/usr"])
|
||||
|
||||
|
|
@ -1305,7 +1216,7 @@ dnl AM_PATH_QT($QT_VERSION,,
|
|||
dnl AC_MSG_ERROR(Test for QT failed.))
|
||||
|
||||
AC_ARG_WITH(static-qt,
|
||||
[ --with-static-qt link qt statically if possible],
|
||||
[ --with-static-qt Link qt statically if possible],
|
||||
sysstaticqt=$withval)
|
||||
|
||||
if test "$sysstaticqt" != "yes"; then
|
||||
|
|
@ -1597,7 +1508,7 @@ dnl
|
|||
dnl Check the command line for --with-pthreads
|
||||
dnl
|
||||
AC_ARG_WITH(pthreads,
|
||||
[ --with-pthreads use system pthread library ],
|
||||
[ --with-pthreads Force use of system pthread library with NSPR ],
|
||||
[if test "$withval" = "yes"
|
||||
then
|
||||
if test "$USE_PTHREADS"x = x
|
||||
|
|
@ -1678,11 +1589,11 @@ dnl We always use the system NSPR from now on...this option
|
|||
dnl tells where to find NSPR rather than whether to use it.
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(nspr,
|
||||
[ --with-nspr=\$dir location of nspr headers and libraries],
|
||||
[ --with-nspr=PFX Prefix where NSPR is installed],
|
||||
NSPR_DIR=$withval)
|
||||
|
||||
AC_ARG_WITH(nsprlib,
|
||||
[ --with-nsprlib=\$dir location of nspr libraries],
|
||||
[ --with-nsprlib=DIR Directory where NSPR libraries are installed],
|
||||
NSPR_LIBDIR=$withval)
|
||||
|
||||
dnl Skip this if cross-compiling, since the checks will fail.
|
||||
|
|
@ -2158,13 +2069,13 @@ MOZ_ARG_DISABLE_BOOL(async-dns,
|
|||
dnl build mozilla/xpfe by default
|
||||
MOZ_BUILD_XPFE=1
|
||||
MOZ_ARG_DISABLE_BOOL(build-xpfe,
|
||||
[ --disable-build-xpfe Dont build mozilla/xpfe],
|
||||
[ --disable-build-xpfe Disable building of mozilla/xpfe],
|
||||
MOZ_BUILD_XPFE= )
|
||||
|
||||
dnl build editor by default
|
||||
MOZ_EDITOR=1
|
||||
MOZ_ARG_DISABLE_BOOL(editor,
|
||||
[ --disable-editor Dont build the editor],
|
||||
[ --disable-editor Disable building of editor component],
|
||||
MOZ_EDITOR= )
|
||||
|
||||
dnl This will be part of the address book
|
||||
|
|
@ -2176,7 +2087,7 @@ dnl [ NO_UNIX_LDAP=1 ])
|
|||
dnl build Mail & News by default
|
||||
MOZ_MAIL_NEWS=1
|
||||
MOZ_ARG_DISABLE_BOOL(mailnews,
|
||||
[ --disable-mailnews Dont build Mail & News],
|
||||
[ --disable-mailnews Disable building of mail & news components],
|
||||
MOZ_MAIL_NEWS= )
|
||||
if test "$MOZ_MAIL_NEWS"; then
|
||||
AC_DEFINE(MOZ_MAIL_NEWS)
|
||||
|
|
@ -2186,7 +2097,7 @@ AC_SUBST(MOZ_MAIL_NEWS)
|
|||
dnl NECKO is the new netlib module. Build Necko by default
|
||||
NECKO=1
|
||||
MOZ_ARG_DISABLE_BOOL(necko,
|
||||
[ --disable-necko Dont build Necko, the new network library.],
|
||||
[ --disable-necko Dont build Necko, the new network library.],
|
||||
NECKO=)
|
||||
if test "$NECKO"; then
|
||||
AC_DEFINE(NECKO)
|
||||
|
|
@ -2204,8 +2115,6 @@ MOZ_ARG_ENABLE_BOOL(pics,
|
|||
ENABLE_PICS=1
|
||||
AC_DEFINE(ENABLE_PICS))
|
||||
|
||||
|
||||
|
||||
dnl build the tests by default
|
||||
ENABLE_TESTS=1
|
||||
MOZ_ARG_DISABLE_BOOL(tests,
|
||||
|
|
@ -2214,14 +2123,14 @@ MOZ_ARG_DISABLE_BOOL(tests,
|
|||
|
||||
dnl Build browsing profile; off by default
|
||||
MOZ_ARG_ENABLE_BOOL(brprof,
|
||||
[ --enable-brprof Enable browsing profile cookie],
|
||||
[ --enable-brprof Enable browsing profile cookie],
|
||||
MOZ_BRPROF=1
|
||||
AC_DEFINE(MOZ_BRPROF))
|
||||
|
||||
dnl Build w/o X11 shared mem extensions by default
|
||||
if test "$no_x" != "yes"; then
|
||||
AC_ARG_ENABLE(x11-shm,
|
||||
[ --enable-x11-shm Enable use of X11 shared mem in gfx],
|
||||
[ --enable-x11-shm Enable use of X11 shared mem in gfx],
|
||||
[ if test "$enableval" = "yes"; then
|
||||
if test "$ac_cv_header_sys_ipc_h" = "yes" &&
|
||||
test "$ac_cv_header_sys_shm_h" = "yes" &&
|
||||
|
|
@ -2292,7 +2201,8 @@ esac
|
|||
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(monolithic-toolkit,
|
||||
[ --enable-monolithic-toolkit Link the toolkit into the app],
|
||||
[ --enable-monolithic-toolkit
|
||||
Link the toolkit into the app],
|
||||
MOZ_MONOLITHIC_TOOLKIT=1)
|
||||
|
||||
|
||||
|
|
@ -2308,7 +2218,7 @@ dnl ========================================================
|
|||
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(gtk-mozilla,
|
||||
[ --disable-gtk-mozilla Disable building of GtkMozilla GTK+ widget],
|
||||
[ --disable-gtk-mozilla Disable building of GtkMozilla GTK+ widget],
|
||||
MOZ_ENABLE_GTK_MOZILLA=)
|
||||
|
||||
|
||||
|
|
@ -2322,7 +2232,8 @@ dnl ========================================================
|
|||
ENABLE_PIC_DSO_CFLAGS=1
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(pic-dso-cflags,
|
||||
[ --disable-pic-dso-cflags Dont generate PIC for shared libs)],
|
||||
[ --disable-pic-dso-cflags
|
||||
Do not generate PIC for shared libs)],
|
||||
ENABLE_PIC_DSO_CFLAGS= )
|
||||
|
||||
if test ! "$ENABLE_PIC_DSO_CFLAGS"
|
||||
|
|
@ -2342,15 +2253,16 @@ CookieManagement=1
|
|||
SingleSignon=1
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(client-wallet,
|
||||
[ --disable-client-wallet Disable ClientWallet],
|
||||
[ --disable-client-wallet Disable ClientWallet (BROKEN)],
|
||||
ClientWallet= )
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(cookie-management,
|
||||
[ --disable-cookie-management Disable CookieManagement],
|
||||
[ --disable-cookie-management
|
||||
Disable CookieManagement (BROKEN)],
|
||||
CookieManagement= )
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(single-signon,
|
||||
[ --disable-single-signon Disable SingleSignon],
|
||||
[ --disable-single-signon Disable SingleSignon],
|
||||
SingleSignon= )
|
||||
|
||||
if test "$ClientWallet"
|
||||
|
|
@ -2379,7 +2291,8 @@ dnl ========================================================
|
|||
MOZ_ARG_HEADER(Compiler Options)
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(crash-on-assert,
|
||||
[ --enable-crash-on-assert Make NS_ASSERTION crash on Unix],
|
||||
[ --enable-crash-on-assert
|
||||
Make NS_ASSERTION crash on Unix],
|
||||
AC_DEFINE(UNIX_CRASH_ON_ASSERT))
|
||||
|
||||
dnl ========================================================
|
||||
|
|
@ -2424,7 +2337,7 @@ then
|
|||
fi
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(debug,
|
||||
[ --disable-debug Disable building with debug info],
|
||||
[ --disable-debug Disable building with debug info],
|
||||
MOZ_DEBUG=)
|
||||
|
||||
if test "$MOZ_DEBUG"
|
||||
|
|
@ -2454,7 +2367,7 @@ if test -z "$MOZ_POST_PROGRAM_COMMAND"; then
|
|||
fi
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(strip-libs,
|
||||
[ --enable-strip-libs Enable stripping of .so and .a libs ],
|
||||
[ --enable-strip-libs Enable stripping of .so and .a libs ],
|
||||
[ MOZ_POST_DSO_LIB_COMMAND=strip
|
||||
MOZ_POST_PROGRAM_COMMAND=strip ])
|
||||
|
||||
|
|
@ -2468,7 +2381,8 @@ dnl ========================================================
|
|||
MOZ_STRIP_NOT_EXPORTED=
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(strip-not-exported,
|
||||
[ --enable-strip-not-exported Enable stripping of not exported symbols in .so files ],
|
||||
[ --enable-strip-not-exported
|
||||
Enable stripping of not exported symbols in .so files ],
|
||||
[MOZ_STRIP_NOT_EXPORTED=1
|
||||
AC_DEFINE(MOZ_STRIP_NOT_EXPORTED) ])
|
||||
|
||||
|
|
@ -2503,7 +2417,7 @@ dnl = Enable debug for specific modules only
|
|||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_STRING(debug-modules,
|
||||
[ --with-debug-modules Enable debug for specific modules only],
|
||||
[ --with-debug-modules Enable debug for specific modules only],
|
||||
[ MOZ_DEBUG_MODULES=`echo $withval | sed 's/,/ /g'` ] )
|
||||
dnl ========================================================
|
||||
|
||||
|
|
@ -2515,7 +2429,7 @@ dnl = Enable debug for specific modules only
|
|||
dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_STRING(extensions,
|
||||
[ --with-extensions Enable extensions (dirs in extensions/)],
|
||||
[ --with-extensions Enable extensions (dirs in extensions/)],
|
||||
[ MOZ_EXTENSIONS=`echo $withval | sed 's/,/ /g'` ] )
|
||||
dnl ========================================================
|
||||
|
||||
|
|
@ -2546,7 +2460,8 @@ fi
|
|||
|
||||
dnl pass -Wno-long-long to the compiler
|
||||
MOZ_ARG_ENABLE_BOOL(long-long-warning,
|
||||
[ --enable-long-long-warning Pass -Wno-long-long to the compiler],
|
||||
[ --enable-long-long-warning
|
||||
Pass -Wno-long-long to the compiler],
|
||||
_IGNORE_LONG_LONG_WARNINGS=)
|
||||
if test "$_IGNORE_LONG_LONG_WARNINGS"; then
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
|
|
@ -2595,11 +2510,13 @@ MOZ_ARG_ENABLE_BOOL(insure,
|
|||
[ MOZ_INSURE="insure" MOZ_INSURIFYING=1 MOZ_INSURE_DIRS="." MOZ_INSURE_EXCLUDE_DIRS="config" ])
|
||||
|
||||
MOZ_ARG_WITH_STRING(insure-dirs,
|
||||
[ --with-insure-dirs=\$dirs Dirs to instrument ],
|
||||
[ --with-insure-dirs=\$dirs
|
||||
Dirs to instrument ],
|
||||
MOZ_INSURE_DIRS=$withval )
|
||||
|
||||
MOZ_ARG_WITH_STRING(insure-exclude-dirs,
|
||||
[ --with-insure-exclude-dirs=\$dirs Dirs to not instrument ],
|
||||
[ --with-insure-exclude-dirs=\$dirs
|
||||
Dirs to not instrument ],
|
||||
MOZ_INSURE_EXCLUDE_DIRS="config $withval" )
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(profile,
|
||||
|
|
@ -2623,7 +2540,7 @@ MOZ_ARG_ENABLE_BOOL(wrap-malloc,
|
|||
fi])
|
||||
|
||||
MOZ_ARG_WITH_STRING(wrap-malloc,
|
||||
[ --with-wrap-malloc-=\$dir Location of malloc wrapper library],
|
||||
[ --with-wrap-malloc=\$dir Location of malloc wrapper library],
|
||||
WRAP_MALLOC_LIB=$withval)
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(efence,
|
||||
|
|
@ -2706,7 +2623,7 @@ dnl ========================================================
|
|||
MOZ_DISABLE_DTD_DEBUG=
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(dtd-debug,
|
||||
[ --disable-dtd-debug Disable some DTD debuggin code in the parser)],
|
||||
[ --disable-dtd-debug Disable some DTD debuggin code in the parser)],
|
||||
MOZ_DISABLE_DTD_DEBUG=1
|
||||
AC_DEFINE(MOZ_DISABLE_DTD_DEBUG) )
|
||||
|
||||
|
|
@ -2759,7 +2676,7 @@ dnl ========================================================
|
|||
NO_STATIC_LIB=1
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(static,
|
||||
[ --enable-static Enable building of internal static libs],
|
||||
[ --enable-static Enable building of internal static libs],
|
||||
NO_STATIC_LIB=)
|
||||
|
||||
case "$target" in
|
||||
|
|
@ -2848,7 +2765,7 @@ AC_SUBST(SingleSignon)
|
|||
dnl system JPEG support
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(jpeg,
|
||||
[ --with-jpeg=\$dir use system libjpeg in \$dir if more recent],
|
||||
[ --with-jpeg[=\$dir] Use system libjpeg [installed at prefix \$dir]],
|
||||
JPEG_DIR=$withval)
|
||||
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
|
|
@ -2890,7 +2807,7 @@ fi
|
|||
dnl system ZLIB support
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(zlib,
|
||||
[ --with-zlib=\$dir use system libz in \$dir],
|
||||
[ --with-zlib[=\$dir] Use system libz [installed at prefix \$dir]],
|
||||
ZLIB_DIR=$withval)
|
||||
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
|
|
@ -2921,7 +2838,7 @@ fi
|
|||
dnl system PNG Support
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(png,
|
||||
[ --with-png=\$dir use system libpng in \$dir if more recent],
|
||||
[ --with-png[=\$dir] Use system libpng [installed at prefix \$dir]],
|
||||
PNG_DIR=$withval)
|
||||
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
|
|
@ -2966,11 +2883,11 @@ dnl ==============================================================
|
|||
MOZ_FULLCIRCLE=
|
||||
FULLCIRCLE_LIBS=
|
||||
MOZ_ARG_ENABLE_BOOL(fullcircle,
|
||||
[ --enable-fullcircle Enable FullCircle/Talkback support],
|
||||
[ --enable-fullcircle Enable FullCircle/Talkback support],
|
||||
[ MOZ_FULLCIRCLE=1 FULLCIRCLE_LIBS="-lfullsoft" ])
|
||||
|
||||
AC_ARG_WITH(fullcircle,
|
||||
[ --with-fullcircle=\$dir location of FullCircle headers and libraries],
|
||||
[ --with-fullcircle=\$dir Location of FullCircle headers and libraries],
|
||||
FULLCIRCLE_DIR=$withval,
|
||||
FULLCIRCLE_DIR=no)
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче