зеркало из https://github.com/mozilla/pjs.git
Add support for file-based options, 'myconfig.sh'.
This commit is contained in:
slamm%netscape.com
Родитель
a117ff4f14
Коммит
ecd46519ab
|
|
@ -3,5 +3,6 @@ dnl Local autoconf macros used with mozilla
|
|||
dnl The contents of this file are under the Public Domain.
|
||||
dnl
|
||||
|
||||
builtin(include, gtk.m4)dnl
|
||||
builtin(include, build/autoconf/gtk.m4)dnl
|
||||
builtin(include, build/autoconf/altoptions.m4)dnl
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
dnl The contents of this file are subject to the Netscape Public License
|
||||
dnl Version 1.0 (the "NPL"); you may not use this file except in
|
||||
dnl compliance with the NPL. You may obtain a copy of the NPL at
|
||||
dnl http://www.mozilla.org/NPL/
|
||||
dnl
|
||||
dnl Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
dnl for the specific language governing rights and limitations under the
|
||||
dnl NPL.
|
||||
dnl
|
||||
dnl The Initial Developer of this code under the NPL is Netscape
|
||||
dnl Communications Corporation. Portions created by Netscape are
|
||||
dnl Copyright (C) 1999 Netscape Communications Corporation. All Rights
|
||||
dnl Reserved.
|
||||
dnl
|
||||
|
||||
dnl altoptions.m4 - An alternative way of specifying command-line options.
|
||||
dnl These macros are needed to support a menu-based configurator.
|
||||
dnl This file also includes the macro, AM_READ_MYCONFIG, for reading
|
||||
dnl the 'myconfig.m4' file.
|
||||
|
||||
dnl Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
|
||||
|
||||
|
||||
dnl AM_ARG_ENABLE_BOOL( NAME, HELP, IF-YES [, IF-NO [, ELSE]])
|
||||
dnl AM_ARG_DISABLE_BOOL( NAME, HELP, IF-NO [, IF-YES [, ELSE]])
|
||||
dnl AM_ARG_ENABLE_STRING( NAME, HELP, IF-SET [, ELSE])
|
||||
dnl AM_ARG_ENABLE_BOOL_OR_STRING( NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
|
||||
dnl AM_ARG_WITH_BOOL( NAME, HELP, IF-YES [, IF-NO [, ELSE])
|
||||
dnl AM_ARG_WITHOUT_BOOL( NAME, HELP, IF-NO [, IF-YES [, ELSE])
|
||||
dnl AM_ARG_WITH_STRING( NAME, HELP, IF-SET [, ELSE])
|
||||
dnl AM_READ_MYCONFIG() - Read in 'myconfig.sh' file
|
||||
|
||||
|
||||
dnl AM_TWO_STRING_TEST(NAME, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
|
||||
AC_DEFUN(AM_TWO_STRING_TEST,
|
||||
[if test "$enableval" = "[$2]"; then
|
||||
ifelse([$3], , :, [$3])
|
||||
elif test "$enableval" = "[$4]"; then
|
||||
ifelse([$5], , :, [$5])
|
||||
else
|
||||
ifelse([$6], ,
|
||||
[AC_MSG_ERROR([Option, [$1], does not take an argument ($enableval).])],
|
||||
[$6])
|
||||
fi])
|
||||
|
||||
dnl AM_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
|
||||
AC_DEFUN(AM_ARG_ENABLE_BOOL,
|
||||
[AC_ARG_ENABLE([$1], [$2],
|
||||
[AM_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
|
||||
[$5])])
|
||||
|
||||
dnl AM_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
|
||||
AC_DEFUN(AM_ARG_DISABLE_BOOL,
|
||||
[AC_ARG_ENABLE([$1], [$2],
|
||||
[AM_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
|
||||
[$5])])
|
||||
|
||||
dnl AM_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
|
||||
AC_DEFUN(AM_ARG_ENABLE_STRING,
|
||||
[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
|
||||
|
||||
dnl AM_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
|
||||
AC_DEFUN(AM_ARG_ENABLE_BOOL_OR_STRING,
|
||||
[ifelse([$5], ,
|
||||
[errprint([Option, $1, needs an "IF-SET" argument.
|
||||
])
|
||||
m4exit(1)],
|
||||
[AC_ARG_ENABLE([$1], [$2],
|
||||
[AM_TWO_STRING_TEST([$1], yes, [$3], no, [$4], [$5])],
|
||||
[$6])])])
|
||||
|
||||
dnl AM_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
|
||||
AC_DEFUN(AM_ARG_WITH_BOOL,
|
||||
[AC_ARG_WITH([$1], [$2],
|
||||
[AM_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
|
||||
[$5])])
|
||||
|
||||
dnl AM_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
|
||||
AC_DEFUN(AM_ARG_WITHOUT_BOOL,
|
||||
[AC_ARG_WITH([$1], [$2],
|
||||
[AM_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
|
||||
[$5])])
|
||||
|
||||
dnl AM_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
|
||||
AC_DEFUN(AM_ARG_WITH_STRING,
|
||||
[AC_ARG_WITH([$1], [$2], [$3], [$4])])
|
||||
|
||||
|
||||
|
||||
dnl AM_READ_MYCONFIG() - Read in 'myconfig.sh' file
|
||||
AC_DEFUN(AM_READ_MYCONFIG,
|
||||
[AC_REQUIRE([AC_INIT_BINSH])dnl
|
||||
# Read in 'myconfig.sh' script to set the initial options.
|
||||
# See the load-myconfig.sh script for more details.
|
||||
_topsrcdir=`dirname [$]0`
|
||||
_load_myconfig=$_topsrcdir/build/autoconf/load-myconfig.sh
|
||||
if test "$MOZ_MYCONFIG"; then
|
||||
. $_load_myconfig
|
||||
elif test -f myconfig.sh; then
|
||||
MOZ_MYCONFIG=myconfig.sh
|
||||
. $_load_myconfig
|
||||
elif test -f $_topsrcdir/myconfig.sh; then
|
||||
MOZ_MYCONFIG=$_topscrdir/myconfig.sh
|
||||
. $_load_myconfig
|
||||
fi])
|
||||
|
||||
dnl This gets inserted at the top of the configure script
|
||||
AM_READ_MYCONFIG
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
# sh
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1999 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
# load-myconfig.sh - Loads options from myconfig.sh onto configure's
|
||||
# command-line. The myconfig.sh is searched for in the following
|
||||
# order: $MOZ_MYCONFIG, $objdir/myconfig.sh, $topsrcdir/myconfig.sh.
|
||||
#
|
||||
# The options from myconfig.sh are inserted into the command-line
|
||||
# before the real command-line options. This way the real options
|
||||
# will override any myconfig.sh options.
|
||||
#
|
||||
# myconfig.sh is a shell script. To add an option to configure's
|
||||
# command-line use the pre-defined function, ac_add_options,
|
||||
#
|
||||
# ac_add_options <configure-option> [<configure-option> ... ]
|
||||
#
|
||||
# For example,
|
||||
#
|
||||
# ac_add_options --with-pthreads --enable-debug
|
||||
#
|
||||
# ac_add_options can be called multiple times in myconfig.sh.
|
||||
# Each call adds more options to configure's command-line.
|
||||
#
|
||||
# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
|
||||
|
||||
|
||||
ac_add_options() {
|
||||
for _opt
|
||||
do
|
||||
# Escape shell characters, space, tab, dollar, quote, backslash.
|
||||
_opt=`echo $_opt | sed -e 's/\([\ \ \$\"\\]\)/\\\\\1/g;'`
|
||||
|
||||
config_file_options="$config_file_options $_opt"
|
||||
done
|
||||
}
|
||||
|
||||
ac_echo_options() {
|
||||
echo "Adding options from `pwd`/myconfig.sh:"
|
||||
eval "set -- $config_file_options"
|
||||
for opt
|
||||
do
|
||||
echo " $opt"
|
||||
done
|
||||
}
|
||||
|
||||
#
|
||||
# Define load the options
|
||||
#
|
||||
ac_options=
|
||||
config_file_options=
|
||||
|
||||
# Save the real command-line options
|
||||
for _opt
|
||||
do
|
||||
# Escape shell characters, space, tab, dollar, quote, backslash.
|
||||
_opt=`echo $_opt | sed -e 's/\([\ \ \$\"\\]\)/\\\\\1/g;'`
|
||||
|
||||
ac_options="$ac_options \"$_opt\""
|
||||
done
|
||||
|
||||
. $MOZ_MYCONFIG
|
||||
|
||||
ac_echo_options 1>&2
|
||||
|
||||
eval "set -- $config_file_options $ac_options"
|
||||
|
||||
158
configure.in
158
configure.in
|
|
@ -29,8 +29,10 @@ dnl AC_CONFIG_HEADER(include/config.h nsprpub/include/config.h)
|
|||
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
dnl Set this define to make fixes w/o breaking anything else
|
||||
dnl Set this define to make fixes w/o breaking anything else.
|
||||
AC_DEFINE(USE_AUTOCONF)
|
||||
|
||||
dnl Always set this for mozilla.
|
||||
AC_DEFINE(MOZILLA_CLIENT)
|
||||
|
||||
dnl d=`pwd`
|
||||
|
|
@ -388,25 +390,29 @@ else
|
|||
fi
|
||||
CC=$_SAVE_CC
|
||||
|
||||
dnl Mozilla specific options
|
||||
dnl ========================================================
|
||||
# Mozilla specific options
|
||||
# ========================================================
|
||||
dnl builtin(include, build/autoconf/mozconfig.in)dnl
|
||||
|
||||
dnl nglayout only supports building with one toolkit
|
||||
dnl so ignore everything after the first,
|
||||
AC_ARG_ENABLE(toolkit,
|
||||
dnl nglayout only supports building with one toolkit
|
||||
dnl so ignore everything after the first ,
|
||||
AM_ARG_ENABLE_STRING(toolkit,
|
||||
[ --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"`;
|
||||
if test "$enableval" != "motif" && test "$enableval" != "gtk" && test $res = 0; then
|
||||
AC_MSG_ERROR(Toolkit must be either gtk or motif.)
|
||||
else
|
||||
MOZ_TOOLKIT=`echo "$enableval" | sed -e "s/,.*//g" `
|
||||
fi
|
||||
],
|
||||
fi],
|
||||
MOZ_TOOLKIT=USE_DEFAULT)
|
||||
|
||||
if [ test "$MOZ_TOOLKIT" = "USE_DEFAULT" ]; then
|
||||
if test "$MOZ_TOOLKIT" = "USE_DEFAULT"; then
|
||||
res=`echo $target_os| grep -c "^Rhapsody"`
|
||||
if [ test $res != 0 ]; then
|
||||
if test $res != 0; then
|
||||
MOZ_TOOLKIT="rhapsody"
|
||||
else
|
||||
MOZ_TOOLKIT="gtk"
|
||||
|
|
@ -419,101 +425,69 @@ CFLAGS="$CFLAGS -DMOZ_DLL_SUFFIX=$DLL_SUFFIX"
|
|||
|
||||
OS_TARGET=`uname -s`
|
||||
|
||||
AC_ARG_ENABLE(shared,
|
||||
AM_ARG_DISABLE_BOOL(shared,
|
||||
[ --disable-shared disable building of internal shared libs],
|
||||
[if test "$enableval" = "no"; then
|
||||
NO_SHARED_LIB=1
|
||||
fi] )
|
||||
NO_SHARED_LIB=1)
|
||||
|
||||
AC_ARG_ENABLE(static,
|
||||
AM_ARG_DISABLE_BOOL(static,
|
||||
[ --disable-static disable building of internal static libs (broken)],
|
||||
[if test "$enableval" = "no"; then
|
||||
NO_STATIC_LIB=1
|
||||
fi] )
|
||||
NO_STATIC_LIB=1)
|
||||
|
||||
AC_ARG_ENABLE(crypto,
|
||||
AM_ARG_ENABLE_BOOL(crypto,
|
||||
[ --enable-crypto enable use of SSL (untested)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_SECURITY=1
|
||||
else
|
||||
MOZ_SECURITY=
|
||||
fi],
|
||||
[MOZ_SECURITY= ])
|
||||
MOZ_SECURITY=1)
|
||||
|
||||
AC_ARG_ENABLE(netcast,
|
||||
AM_ARG_ENABLE_BOOL(netcast,
|
||||
[ --enable-netcast enable use of netcast (untested)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_NETCAST=1
|
||||
fi ] )
|
||||
MOZ_NETCAST=1)
|
||||
|
||||
AC_ARG_ENABLE(java,
|
||||
AM_ARG_ENABLE_BOOL(java,
|
||||
[ --enable-java enable use of java applets (untested)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_JAVA=1
|
||||
FULL_STATIC_BUILD=
|
||||
NO_SHARED_LIB=
|
||||
fi] )
|
||||
dnl [ Note: setting this will also unset FULL_STATIC_BUILD and NO_SHARED_LIB],
|
||||
[MOZ_JAVA=1 FULL_STATIC_BUILD= NO_SHARED_LIB=])
|
||||
|
||||
AC_ARG_ENABLE(oji,
|
||||
AM_ARG_ENABLE_BOOL(oji,
|
||||
[ --enable-oji enable use of Open JVM Interface],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_OJI=1
|
||||
FULL_STATIC_BUILD=
|
||||
NO_SHARED_LIB=
|
||||
fi] )
|
||||
dnl [ Note: setting this will also unset FULL_STATIC_BUILD and NO_SHARED_LIB],
|
||||
[MOZ_OJI=1 FULL_STATIC_BUILD= NO_SHARED_LIB=])
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
AM_ARG_ENABLE_BOOL_OR_STRING(debug,
|
||||
[ --enable-debug enable debug symbols],
|
||||
[if test "$enableval" = yes; then
|
||||
MOZ_DEBUG=1 OPTIMIZE="-g"
|
||||
else
|
||||
MOZ_DEBUG_MODULES=`echo $enableval | sed 's|,| |g'`
|
||||
fi] )
|
||||
[ MOZ_DEBUG=1 OPTIMIZE="-g" ],
|
||||
[],
|
||||
[MOZ_DEBUG_MODULES=`echo $enableval | sed 's|,| |g'` ])
|
||||
|
||||
AC_ARG_ENABLE(profile,
|
||||
AM_ARG_ENABLE_BOOL(profile,
|
||||
[ --enable-profile enable profiling (solaris only)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZILLA_GPROF=1
|
||||
fi] )
|
||||
MOZILLA_GPROF=1)
|
||||
|
||||
AC_ARG_ENABLE(mailnews,
|
||||
AM_ARG_ENABLE_BOOL(mailnews,
|
||||
[ --enable-mailnews enable Mail & News (broken)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_MAIL_NEWS=1
|
||||
fi] )
|
||||
MOZ_MAIL_NEWS=1)
|
||||
|
||||
AC_ARG_ENABLE(ldap,
|
||||
AM_ARG_ENABLE_BOOL(ldap,
|
||||
[ --enable-ldap enable LDAP directory access],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_LDAP=1
|
||||
fi] )
|
||||
MOZ_LDAP=1)
|
||||
|
||||
AC_ARG_ENABLE(editor,
|
||||
AM_ARG_ENABLE_BOOL(editor,
|
||||
[ --enable-editor enable editor],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_EDITOR=1
|
||||
fi] )
|
||||
MOZ_EDITOR=1)
|
||||
|
||||
AC_ARG_ENABLE(asserts,
|
||||
AM_ARG_DISABLE_BOOL(asserts,
|
||||
[ --disable-asserts disable asserts during debugging],
|
||||
[if test "$enableval" = "no"; then
|
||||
UNIX_SKIP_ASSERTS=1
|
||||
fi] )
|
||||
UNIX_SKIP_ASSERTS=1)
|
||||
|
||||
AC_ARG_ENABLE(async-dns,
|
||||
AM_ARG_DISABLE_BOOL(async-dns,
|
||||
[ --disable-async-dns disable separate dns thread],
|
||||
[if test "$enableval" = "no"; then
|
||||
NO_UNIX_ASYNC_DNS=1
|
||||
fi] )
|
||||
NO_UNIX_ASYNC_DNS=1)
|
||||
|
||||
AC_ARG_ENABLE(tests,
|
||||
AM_ARG_ENABLE_BOOL(tests,
|
||||
[ --enable-tests enable test stubs],
|
||||
[if test "$enableval" = "yes"; then
|
||||
ENABLE_TESTS=1
|
||||
fi])
|
||||
ENABLE_TESTS=1)
|
||||
|
||||
AC_ARG_ENABLE(homedir,
|
||||
AM_ARG_ENABLE_STRING(homedir,
|
||||
[ --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
|
||||
AC_MSG_ERROR("Homedir must be single relative path.")
|
||||
|
|
@ -522,42 +496,31 @@ AC_ARG_ENABLE(homedir,
|
|||
fi],
|
||||
MOZ_USER_DIR='\".mozilla\"' )
|
||||
|
||||
AC_ARG_ENABLE(smart-mail,
|
||||
AM_ARG_ENABLE_BOOL(smart-mail,
|
||||
[ --enable-smart-mail enable HTML/RDF-based client-side mail (untested)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_SMART_MAIL=1
|
||||
fi])
|
||||
MOZ_SMART_MAIL=1)
|
||||
|
||||
AC_ARG_ENABLE(mail-compose,
|
||||
AM_ARG_ENABLE_BOOL(mail-compose,
|
||||
[ --enable-mail-compose enable old Messenger mail composer ],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_MAIL_COMPOSE=1
|
||||
MOZ_EDITOR=1
|
||||
fi])
|
||||
[ MOZ_MAIL_COMPOSE=1 MOZ_EDITOR=1 ])
|
||||
|
||||
NO_UNIX_LDAP=1
|
||||
AC_ARG_ENABLE(ldap,
|
||||
AM_ARG_ENABLE_BOOL(ldap,
|
||||
[ --enable-ldap enable ldap ],
|
||||
[if test "$enableval" = "yes"; then
|
||||
NO_UNIX_LDAP=
|
||||
fi] )
|
||||
NO_UNIX_LDAP=,
|
||||
NO_UNIX_LDAP=1)
|
||||
|
||||
AC_ARG_ENABLE(idltool,
|
||||
AM_ARG_ENABLE_BOOL(idltool,
|
||||
[ --enable-idltool build idl tool (default=no) ],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_IDL_TOOL=1
|
||||
fi] )
|
||||
MOZ_IDL_TOOL=1)
|
||||
|
||||
AC_ARG_ENABLE(wrap-malloc,
|
||||
AM_ARG_ENABLE_BOOL(wrap-malloc,
|
||||
[ --enable-wrap-malloc wrap malloc calls (gnu linker only) (default=no) ],
|
||||
[if test "$enableval" = "yes"; then
|
||||
if test "$GNU_CC" = 1; then
|
||||
[ 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
|
||||
fi])
|
||||
|
||||
AC_ARG_WITH(wrap-malloc,
|
||||
AM_ARG_WITH_STRING(wrap-malloc,
|
||||
[ --with-wrap-malloc-=\$dir location of malloc wrapper library],
|
||||
WRAP_MALLOC_LIB=$withval)
|
||||
|
||||
|
|
@ -586,6 +549,7 @@ AC_SUBST(FULL_STATIC_BUILD)
|
|||
AC_SUBST(NO_UNIX_LDAP)
|
||||
AC_SUBST(MOZ_IDL_TOOL)
|
||||
|
||||
|
||||
dnl Checks for X libraries.
|
||||
dnl Ordering is important.
|
||||
dnl Xt is dependent upon SM as of X11R6
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче