mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-26 23:23:33 +00:00
Move some defines into configure. Remove unused build variables.
This commit is contained in:
slamm%netscape.com
parent
e7fa038c87
commit
ed0937533e
@ -45,7 +45,6 @@ BUILD_PROFILE = @MOZILLA_GPROF@
|
||||
MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@
|
||||
MOZ_EDITOR = @MOZ_EDITOR@
|
||||
MOZ_BRPROF = @MOZ_BRPROF@
|
||||
UNIX_CRASH_ON_ASSERT = @UNIX_CRASH_ON_ASSERT@
|
||||
NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@
|
||||
NO_SHARED_LIB = @NO_SHARED_LIB@
|
||||
NO_NETSCAPE_SHARED = @NO_SHARED_LIB@
|
||||
@ -54,8 +53,6 @@ NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
|
||||
MOZ_STRIP_NOT_EXPORTED = @MOZ_STRIP_NOT_EXPORTED@
|
||||
ENABLE_TESTS = @ENABLE_TESTS@
|
||||
ENABLE_PICS = @ENABLE_PICS@
|
||||
DOM = @MOZ_DOM@
|
||||
MOZ_MAIL_COMPOSE = @MOZ_MAIL_COMPOSE@
|
||||
NO_UNIX_LDAP = @NO_UNIX_LDAP@
|
||||
BUILD_IDLC = @BUILD_IDLC@
|
||||
MODULAR_NETLIB = @MODULAR_NETLIB@
|
||||
@ -146,12 +143,12 @@ ifdef MOZ_INSURIFYING
|
||||
include $(topsrcdir)/config/insure.mk
|
||||
endif # MOZ_INSURIFYING
|
||||
|
||||
ACEMACS = @EMACS@
|
||||
ACPERL = @PERL@
|
||||
ACRANLIB = @RANLIB@
|
||||
ACWHOAMI = @WHOAMI@
|
||||
ACUNZIP = @UNZIP@
|
||||
ACZIP = @ZIP@
|
||||
EMACS = @EMACS@
|
||||
PERL = @PERL@
|
||||
RANLIB = @RANLIB@
|
||||
WHOAMI = @WHOAMI@
|
||||
UNZIP_PROG = @UNZIP@
|
||||
ZIP_PROG = @ZIP@
|
||||
|
||||
ifdef MOZ_NATIVE_JPEG
|
||||
JPEG_CFLAGS = @JPEG_CFLAGS@
|
||||
|
||||
73
configure.in
73
configure.in
@ -2042,14 +2042,12 @@ 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],
|
||||
MOZ_BUILD_XPFE= )
|
||||
|
||||
dnl build editor by default
|
||||
MOZ_EDITOR=1
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(editor,
|
||||
[ --disable-editor Dont build the editor],
|
||||
MOZ_EDITOR= )
|
||||
@ -2062,17 +2060,23 @@ 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],
|
||||
MOZ_MAIL_NEWS= )
|
||||
|
||||
NECKO=1
|
||||
if test "$MOZ_MAIL_NEWS"; then
|
||||
AC_DEFINE(MOZ_MAIL_NEWS)
|
||||
fi
|
||||
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.],
|
||||
NECKO=)
|
||||
if test "$NECKO"; then
|
||||
AC_DEFINE(NECKO)
|
||||
fi
|
||||
AC_SUBST(NECKO)
|
||||
|
||||
dnl Note: This conflicts with --disable-shared
|
||||
MOZ_ARG_ENABLE_BOOL(oji,
|
||||
@ -2082,14 +2086,13 @@ MOZ_ARG_ENABLE_BOOL(oji,
|
||||
dnl Build PICS (mozilla/extensions/pics) code
|
||||
MOZ_ARG_ENABLE_BOOL(pics,
|
||||
[ --enable-pics Enable PICS code],
|
||||
ENABLE_PICS=1)
|
||||
ENABLE_PICS=1
|
||||
AC_DEFINE(ENABLE_PICS))
|
||||
|
||||
AC_DEFINE(ENABLE_PICS)
|
||||
|
||||
|
||||
dnl build the tests by default
|
||||
ENABLE_TESTS=1
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(tests,
|
||||
[ --disable-tests Dont build the tests],
|
||||
ENABLE_TESTS= )
|
||||
@ -2260,10 +2263,9 @@ dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Compiler Options)
|
||||
|
||||
UNIX_CRASH_ON_ASSERT=
|
||||
MOZ_ARG_ENABLE_BOOL(crash-on-assert,
|
||||
[ --enable-crash-on-assert Make NS_ASSERTION crash on Unix],
|
||||
UNIX_CRASH_ON_ASSERT=1)
|
||||
AC_DEFINE(UNIX_CRASH_ON_ASSERT))
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
@ -2314,6 +2316,12 @@ if test "$MOZ_DEBUG"
|
||||
then
|
||||
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $MOZ_DEBUG_FLAGS"
|
||||
AC_DEFINE(DEBUG)
|
||||
AC_DEFINE_UNQUOTED(DEBUG_`$WHOAMI`)
|
||||
AC_DEFINE(TRACING)
|
||||
else
|
||||
AC_DEFINE(NDEBUG)
|
||||
AC_DEFINE(TRIMMED)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
@ -2547,14 +2555,6 @@ dnl = End MOZ_TIMER_LIBS
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
|
||||
dnl MOZ_ARG_ENABLE_BOOL(mail-compose,
|
||||
dnl [ --enable-mail-compose Enable old Messenger mail composer],
|
||||
dnl [ MOZ_MAIL_COMPOSE=1 MOZ_EDITOR=1 ])
|
||||
|
||||
dnl The new mail app is "smart-mail"
|
||||
dnl MOZ_ARG_ENABLE_BOOL(smart-mail,
|
||||
dnl [ --enable-smart-mail Enable HTML/RDF-based client-side mail (untested)],
|
||||
dnl MOZ_SMART_MAIL=1)
|
||||
NO_STATIC_LIB=1
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(static,
|
||||
@ -2597,7 +2597,6 @@ AC_SUBST(NS_USE_NATIVE)
|
||||
AC_SUBST(MOZ_WIDGET_TOOLKIT)
|
||||
AC_SUBST(MOZ_GFX_TOOLKIT)
|
||||
AC_SUBST(MOZ_UPDATE_XTERM)
|
||||
AC_SUBST(NECKO)
|
||||
AC_SUBST(MOZ_MONOLITHIC_TOOLKIT)
|
||||
AC_SUBST(MOZ_TIMER_LIBS)
|
||||
AC_SUBST(MOZ_SECURITY)
|
||||
@ -2611,7 +2610,6 @@ AC_SUBST(MOZ_INSURE)
|
||||
AC_SUBST(MOZ_INSURE_DIRS)
|
||||
AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
|
||||
AC_SUBST(MOZ_INSURIFYING)
|
||||
AC_SUBST(MOZ_MAIL_NEWS)
|
||||
AC_SUBST(MOZ_BUILD_XPFE)
|
||||
dnl AC_SUBST(MOZ_LDAP)
|
||||
AC_SUBST(MOZ_EDITOR)
|
||||
@ -2626,8 +2624,6 @@ AC_SUBST(ENABLE_TESTS)
|
||||
AC_SUBST(ENABLE_PICS)
|
||||
AC_SUBST(MOZ_USER_DIR)
|
||||
dnl AC_SUBST(MOZ_SMART_MAIL)
|
||||
AC_SUBST(MOZ_DOM)
|
||||
AC_SUBST(MOZ_MAIL_COMPOSE)
|
||||
AC_SUBST(FULL_STATIC_BUILD)
|
||||
AC_SUBST(NO_UNIX_LDAP)
|
||||
AC_SUBST(BUILD_IDLC)
|
||||
@ -2799,7 +2795,6 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
dnl AC_SUBST(MOZ_FULLCIRCLE)
|
||||
dnl AC_SUBST(FULLCIRCLE_LIBS)
|
||||
|
||||
|
||||
@ -2914,14 +2909,13 @@ fi # $no_x
|
||||
dnl Set various defines and substitutions
|
||||
dnl ========================================================
|
||||
# netlib stuff
|
||||
AC_DEFINE(MODULAR_NETLIB)
|
||||
MODULAR_NETLIB=1
|
||||
AC_DEFINE(MODULAR_NETLIB)
|
||||
AC_SUBST(MODULAR_NETLIB)
|
||||
if test "$MODULAR_NETLIB" = ""; then
|
||||
if test !"$MODULAR_NETLIB"; then
|
||||
AC_DEFINE(CookieManagement)
|
||||
fi
|
||||
|
||||
|
||||
AC_SUBST(OS_TARGET)
|
||||
if test "$OS_TARGET" = "OS2"; then
|
||||
AC_DEFINE(XP_PC)
|
||||
@ -3128,23 +3122,28 @@ dnl ========================================================
|
||||
# Save the defines header file before autoconf removes it.
|
||||
# (Do not add AC_DEFINE calls after this line.)
|
||||
if test "$_USE_CPP_INCLUDE_FLAG"; then
|
||||
CONFIG_DEFS_H=config-defs.h
|
||||
# Only write config-defs.h when something changes (or it doesn't exist)
|
||||
if test ! -f $CONFIG_DEFS_H \
|
||||
|| diff confdefs.h $CONFIG_DEFS_H | grep \# > /dev/null; then
|
||||
AC_MSG_RESULT("creating $CONFIG_DEFS_H")
|
||||
_CONFIG_TMP=confdefs-tmp.h
|
||||
_CONFIG_DEFS_H=config-defs.h
|
||||
|
||||
if test -n "$VERBOSE_CONFIG_DEFS"; then
|
||||
cat confdefs.h
|
||||
fi
|
||||
|
||||
cat > $CONFIG_DEFS_H <<\EOF
|
||||
cat > $_CONFIG_TMP <<\EOF
|
||||
/* List of defines generated by configure. Included with preprocessor flag,
|
||||
* -include, to avoid long list of -D defines on the compile command-line.
|
||||
* Do not edit.
|
||||
*/
|
||||
EOF
|
||||
cat confdefs.h >> $CONFIG_DEFS_H
|
||||
sort confdefs.h >> $_CONFIG_TEMP
|
||||
|
||||
# Only write config-defs.h when something changes (or it doesn't exist)
|
||||
if cmp -s $_CONFIG_TMP $_CONFIG_DEFS_H; then
|
||||
rm $_CONFIG_TMP
|
||||
else
|
||||
AC_MSG_RESULT("creating $_CONFIG_DEFS_H")
|
||||
mv -f $_CONFIG_TMP $_CONFIG_DEFS_H
|
||||
|
||||
if test "$VERBOSE_CONFIG_DEFS"; then
|
||||
echo ==== $_CONFIG_DEFS_H =================================
|
||||
cat $_CONFIG_DEFS_H
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user