From 21ec6f77b63fdaae78e51bca580010a78f04c7b3 Mon Sep 17 00:00:00 2001 From: "slamm%netscape.com" Date: Fri, 19 Feb 1999 17:29:51 +0000 Subject: [PATCH] Reorder/group options. Align comments. Remove dead options. --- configure.in | 266 +++++++++++++++++++++++++++------------------------ 1 file changed, 140 insertions(+), 126 deletions(-) diff --git a/configure.in b/configure.in index 1754706497a..d4eff2696cc 100644 --- a/configure.in +++ b/configure.in @@ -478,23 +478,54 @@ dnl AC_MSG_RESULT(no) dnl fi dnl CFLAGS=$_SAVE_CFLAGS -dnl Make pedantic a flag for now since the builds currently choke on it. -MOZ_ARG_ENABLE_BOOL(pedantic, -[ --enable-pedantic Issue all warnings demanded by strict ANSI C ], - WARNINGS_CFLAGS="${WARNINGS_CFLAGS} -pedantic") - # Mozilla specific options # ======================================================== dnl The macros used for command line options dnl are defined in build/autoconf/altoptions.m4. +MOZ_ARG_HEADER(Components and Features) + +MOZ_ARG_DISABLE_BOOL(async-dns, +[ --disable-async-dns Disable separate dns thread], + NO_UNIX_ASYNC_DNS=1) + +MOZ_ARG_ENABLE_BOOL(editor, +[ --enable-editor Enable editor], + MOZ_EDITOR=1) + +dnl This will be part of the address book +dnl MOZ_ARG_ENABLE_BOOL(ldap, +dnl [ --enable-ldap Enable LDAP directory access], +dnl [ MOZ_LDAP=1 NO_UNIX_LDAP= ], +dnl [ NO_UNIX_LDAP=1 ]) + +MOZ_ARG_ENABLE_BOOL(mailnews, +[ --enable-mailnews Enable Mail & News], + MOZ_MAIL_NEWS=1) + +dnl build mozilla/nsprpub by default +MOZ_BUILD_NSPR=1 + +MOZ_ARG_DISABLE_BOOL(build-nspr, +[ --disable-build-nspr Dont build mozilla/nsprpub], + MOZ_BUILD_NSPR= ) + +dnl Note: This conflicts with --disable-shared +MOZ_ARG_ENABLE_BOOL(oji, +[ --enable-oji Enable use of Open JVM Interface], + [MOZ_OJI=1 FULL_STATIC_BUILD= NO_SHARED_LIB=]) + +MOZ_ARG_ENABLE_BOOL(tests, +[ --enable-tests Enable test stubs], + ENABLE_TESTS=1) + dnl nglayout only supports building with one toolkit dnl so ignore everything after the first, dnl nglayout only supports building with one toolkit dnl so ignore everything after the first , MOZ_ARG_ENABLE_STRING(toolkit, -[ --enable-toolkit=\$val enable \$val fe (defaults to gtk)], +[ --enable-toolkit=\$val Enable \$val fe (defaults to gtk)], dnl [Toolkit must be either "gtk" or "Motif" (except on Rhapsody.)], [ res=`echo $target_os| grep -c "^Rhapsody"`; @@ -514,104 +545,81 @@ if test "$MOZ_TOOLKIT" = "USE_DEFAULT"; then fi fi -AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, $DLL_SUFFIX) - -MOZ_ARG_DISABLE_BOOL(shared, -[ --disable-shared disable building of internal shared libs], - NO_SHARED_LIB=1) - -MOZ_ARG_DISABLE_BOOL(static, -[ --disable-static disable building of internal static libs (broken)], - NO_STATIC_LIB=1) - -MOZ_ARG_ENABLE_BOOL(xterm-updates, -[ --enable-xterm-updates Update XTERM titles with current command.], - MOZ_UPDATE_XTERM=1) - -MOZ_ARG_ENABLE_BOOL(crypto, -[ --enable-crypto enable use of SSL (untested)], - MOZ_SECURITY=1) - -MOZ_ARG_ENABLE_BOOL(netcast, -[ --enable-netcast enable use of netcast (untested)], - MOZ_NETCAST=1) - -MOZ_ARG_ENABLE_BOOL(java, -[ --enable-java enable use of java applets (untested)], -dnl [ Note: setting this will also unset FULL_STATIC_BUILD and NO_SHARED_LIB], - [MOZ_JAVA=1 FULL_STATIC_BUILD= NO_SHARED_LIB=]) - -MOZ_ARG_ENABLE_BOOL(oji, -[ --enable-oji enable use of Open JVM Interface], -dnl [ Note: setting this will also unset FULL_STATIC_BUILD and NO_SHARED_LIB], - [MOZ_OJI=1 FULL_STATIC_BUILD= NO_SHARED_LIB=]) - -MOZ_ARG_ENABLE_BOOL_OR_STRING(debug, -[ --enable-debug enable debug symbols], - [ MOZ_DEBUG=1 OPTIMIZE_CFLAGS="-g" ], - [], - [MOZ_DEBUG_MODULES=`echo $enableval | sed 's|,| |g'` ]) - -MOZ_ARG_ENABLE_BOOL(gprof, -[ --enable-gprof enable gprof symbols], - [ GPROF_CFLAGS="-pg" ]) - -MOZ_ARG_ENABLE_BOOL(insure, -[ --enable-insure enable insure++ instrumentation (linux only)], - [ MOZ_INSURE="insure" MOZ_INSURIFYING=1 MOZ_INSURE_DIRS="mozilla" MOZ_INSURE_EXCLUDE_DIRS="mozilla/config" ]) - -MOZ_ARG_WITH_STRING(insure-dirs, -[ --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 instrument ], - MOZ_INSURE_EXCLUDE_DIRS="mozilla/config $withval" ) - -MOZ_ARG_ENABLE_BOOL(profile, -[ --enable-profile enable profiling (solaris only)], - MOZILLA_GPROF=1) - -MOZ_ARG_ENABLE_BOOL(mailnews, -[ --enable-mailnews enable Mail & News (broken)], - MOZ_MAIL_NEWS=1) - -MOZ_ARG_ENABLE_BOOL(ldap, -[ --enable-ldap enable LDAP directory access], - MOZ_LDAP=1) - -MOZ_ARG_ENABLE_BOOL(editor, -[ --enable-editor enable editor], - MOZ_EDITOR=1) - -MOZ_ARG_DISABLE_BOOL(asserts, -[ --disable-asserts disable asserts during debugging], - UNIX_SKIP_ASSERTS=1) - -MOZ_ARG_DISABLE_BOOL(async-dns, -[ --disable-async-dns disable separate dns thread], - NO_UNIX_ASYNC_DNS=1) - -MOZ_ARG_ENABLE_BOOL(tests, -[ --enable-tests enable test stubs], - ENABLE_TESTS=1) - 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 Dont build mozilla/xpfe], MOZ_BUILD_XPFE= ) -dnl build mozilla/nsprpub by default -MOZ_BUILD_NSPR=1 -MOZ_ARG_DISABLE_BOOL(build-nspr, -[ --disable-build-nspr dont build mozilla/nsprpub], - MOZ_BUILD_NSPR= ) +MOZ_ARG_HEADER(Compiler Options) + +MOZ_ARG_DISABLE_BOOL(asserts, +[ --disable-asserts Disable asserts during debugging], + UNIX_SKIP_ASSERTS=1) + +MOZ_ARG_ENABLE_BOOL_OR_STRING(debug, +[ --enable-debug Enable debug symbols], + [ MOZ_DEBUG=1 OPTIMIZE_CFLAGS="-g" ], + [], + [MOZ_DEBUG_MODULES=`echo $enableval | sed 's|,| |g'` ]) + +MOZ_ARG_ENABLE_BOOL(md, +[ --enable-md Use compiler-based dependencies ], + [ COMPILER_DEPEND=1 + DEPEND_CFLAGS='-Wp,-MMD,.deps/$(*F).pp' ] +) + +dnl Make pedantic a flag for now since the builds currently choke on it. +MOZ_ARG_ENABLE_BOOL(pedantic, +[ --enable-pedantic Issue all warnings demanded by strict ANSI C ], + WARNINGS_CFLAGS="${WARNINGS_CFLAGS} -pedantic") + +dnl Note: This should not be disabled if --enable-oji is set +MOZ_ARG_DISABLE_BOOL(shared, +[ --disable-shared Disable building of internal shared libs], + NO_SHARED_LIB=1) + + +MOZ_ARG_HEADER(Profiling and Instrumenting) + +MOZ_ARG_ENABLE_BOOL(gprof, +[ --enable-gprof Enable gprof symbols], + [ GPROF_CFLAGS="-pg" ]) + +MOZ_ARG_ENABLE_BOOL(insure, +[ --enable-insure Enable insure++ instrumentation (linux only)], + [ MOZ_INSURE="insure" MOZ_INSURIFYING=1 MOZ_INSURE_DIRS="mozilla" MOZ_INSURE_EXCLUDE_DIRS="mozilla/config" ]) + +MOZ_ARG_WITH_STRING(insure-dirs, +[ --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 ], + MOZ_INSURE_EXCLUDE_DIRS="mozilla/config $withval" ) + +MOZ_ARG_ENABLE_BOOL(profile, +[ --enable-profile Enable profiling (solaris only)], + MOZILLA_GPROF=1) + +MOZ_ARG_ENABLE_BOOL(wrap-malloc, +[ --enable-wrap-malloc Wrap malloc calls (gnu linker only) (default=no) ], + [ if test "$GNU_CC" = 1; then + WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc" + MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS)' + fi]) + +MOZ_ARG_WITH_STRING(wrap-malloc, +[ --with-wrap-malloc-=\$dir Location of malloc wrapper library], + WRAP_MALLOC_LIB=$withval) + + +MOZ_ARG_HEADER(Misc. Options) MOZ_ARG_ENABLE_STRING(homedir, -[ --enable-homedir=\$val set the homedir to \$val], +[ --enable-homedir=\$val Set the homedir to \$val], dnl [ Location of the mozilla user directory (default is ~/.mozilla).], [res=`echo $enableval | grep -c "\/"` if [ test $res != 0 ]; then @@ -621,44 +629,49 @@ dnl [ Location of the mozilla user directory (default is ~/.mozilla).], fi], AC_DEFINE(MOZ_USER_DIR,".mozilla") ) -MOZ_ARG_ENABLE_BOOL(smart-mail, -[ --enable-smart-mail enable HTML/RDF-based client-side mail (untested)], - MOZ_SMART_MAIL=1) - -MOZ_ARG_ENABLE_BOOL(mail-compose, -[ --enable-mail-compose enable old Messenger mail composer ], - [ MOZ_MAIL_COMPOSE=1 MOZ_EDITOR=1 ]) - -MOZ_ARG_ENABLE_BOOL(ldap, -[ --enable-ldap enable ldap ], - NO_UNIX_LDAP=, - NO_UNIX_LDAP=1) - MOZ_ARG_ENABLE_BOOL(idltool, -[ --enable-idltool build idl tool (default=no) ], +[ --enable-idltool Build idl tool (default=no) ], MOZ_IDL_TOOL=1) -MOZ_ARG_ENABLE_BOOL(wrap-malloc, -[ --enable-wrap-malloc wrap malloc calls (gnu linker only) (default=no) ], - [ if test "$GNU_CC" = 1; then - WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc" - MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS)' - fi]) +MOZ_ARG_ENABLE_BOOL(xterm-updates, +[ --enable-xterm-updates Update XTERM titles with current command.], + MOZ_UPDATE_XTERM=1) -MOZ_ARG_WITH_STRING(wrap-malloc, -[ --with-wrap-malloc-=\$dir location of malloc wrapper library], - WRAP_MALLOC_LIB=$withval) -MOZ_ARG_ENABLE_BOOL(md, -[ --enable-md use compiler-based dependencies ], - [ COMPILER_DEPEND=1 - DEPEND_CFLAGS='-Wp,-MMD,.deps/$(*F).pp' ] -) +MOZ_ARG_HEADER(Untested or Broken Options) + +MOZ_ARG_ENABLE_BOOL(crypto, +[ --enable-crypto Enable use of SSL (untested)], + MOZ_SECURITY=1) + +dnl Netcaster is dead +dnl MOZ_ARG_ENABLE_BOOL(netcast, +dnl [ --enable-netcast Enable use of netcast (untested)], +dnl MOZ_NETCAST=1) + +dnl Note: This needs to come after --disable-shared +MOZ_ARG_ENABLE_BOOL(java, +[ --enable-java Enable use of java applets (untested)], + [MOZ_JAVA=1 FULL_STATIC_BUILD= NO_SHARED_LIB=]) + +MOZ_ARG_ENABLE_BOOL(mail-compose, +[ --enable-mail-compose Enable old Messenger mail composer ], + [ 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) + +MOZ_ARG_DISABLE_BOOL(static, +[ --disable-static Disable building of internal static libs (broken)], + NO_STATIC_LIB=1) + AC_SUBST(MOZ_TOOLKIT) AC_SUBST(MOZ_UPDATE_XTERM) AC_SUBST(MOZ_SECURITY) -AC_SUBST(MOZ_NETCAST) +dnl AC_SUBST(MOZ_NETCAST) AC_SUBST(MOZ_JAVA) AC_SUBST(MOZ_OJI) AC_SUBST(MOZ_DEBUG) @@ -671,7 +684,7 @@ AC_SUBST(MOZ_INSURIFYING) AC_SUBST(MOZ_MAIL_NEWS) AC_SUBST(MOZ_BUILD_XPFE) AC_SUBST(MOZ_BUILD_NSPR) -AC_SUBST(MOZ_LDAP) +dnl AC_SUBST(MOZ_LDAP) AC_SUBST(MOZ_EDITOR) AC_SUBST(UNIX_SKIP_ASSERTS) AC_SUBST(NO_UNIX_ASYNC_DNS) @@ -679,7 +692,7 @@ AC_SUBST(NO_SHARED_LIB) AC_SUBST(NO_STATIC_LIB) AC_SUBST(ENABLE_TESTS) AC_SUBST(MOZ_USER_DIR) -AC_SUBST(MOZ_SMART_MAIL) +dnl AC_SUBST(MOZ_SMART_MAIL) AC_SUBST(MOZ_DOM) AC_SUBST(MOZ_MAIL_COMPOSE) AC_SUBST(FULL_STATIC_BUILD) @@ -1126,6 +1139,7 @@ AC_SUBST(MKSHLIB_FORCE_ALL) AC_SUBST(MKSHLIB_UNFORCE_ALL) AC_SUBST(DSO_CFLAGS) AC_SUBST(DSO_LDOPTS) +AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, $DLL_SUFFIX) AC_SUBST(DLL_SUFFIX) if test "$USING_HCC"; then