Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pthreads is on by default now for configure. Make client.mk do the same.

Browse Source
This commit is contained in:
slamm%netscape.com 1999-04-12 21:20:59 +00:00
parent 7d2394ef77
commit 6af1a991d4
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/autoconf/mozconfig2defs.sh
View File

@ -37,9 +37,10 @@ ac_add_options() {
# and substitute '@<word>@' with '$(<word)'.
_opt=`echo $_opt | sed -e 's/\([\ \ \$\"\\]\)/\\\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'`
case "$_opt" in
--with-nspr=* ) echo MOZ_WITH_NSPR=`expr $_opt : ".*=\(.*\)"` ;;
--with-pthreads* ) echo MOZ_WITH_PTHREADS=1 ;;
--*-* ) echo "# $_opt is not used by client.mk" ;;
--with-nspr=* ) echo MOZ_WITH_NSPR=`expr $_opt : ".*=\(.*\)"` ;;
--with-pthreads=no ) echo MOZ_WITHOUT_PTHREADS=1 ;;
--without-pthreads ) echo MOZ_WITHOUT_PTHREADS=1 ;;
--*-* ) echo "# $_opt is not used by client.mk" ;;
esac
done
}

20
client.mk
View File

@ -46,14 +46,14 @@
# See http://www.mozilla.org/build/unix.html for more information.
#
# Options:
# MOZ_WITH_NSPR - Nspr directory for configure --with-nspr=
# MOZ_WITH_PTHREADS - Pthreads for nspr and configure
# MOZ_OBJDIR - Destination object directory
# MOZ_WITH_NSPR - Nspr directory for configure --with-nspr=
# MOZ_WITHOUT_PTHREADS - Turn off pthreads for nspr and configure
# MOZ_OBJDIR - Destination object directory
# also,
# MOZ_CO_BRANCH - Branch tag to use for checkout (default: HEAD)
# MOZ_CO_MODULE - Module to checkout (default: SeaMonkeyEditor)
# MOZ_CVS_FLAGS - Flags to pass cvs (default: -q -z3)
# MOZ_CO_FLAGS - Flags to pass after 'cvs co' (default: -P)
# MOZ_CO_BRANCH - Branch tag to use for checkout (default: HEAD)
# MOZ_CO_MODULE - Module to checkout (default: SeaMonkeyEditor)
# MOZ_CVS_FLAGS - Flags to pass cvs (default: -q -z3)
# MOZ_CO_FLAGS - Flags to pass after 'cvs co' (default: -P)
CWD := $(shell pwd)
ifeq (mozilla, $(notdir $(CWD)))
@ -149,7 +149,7 @@ CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
####################################
# NSPR
ifeq ($(MOZ_WITH_PTHREADS), 1)
ifneq ($(MOZ_WITHOUT_PTHREADS), 1)
NSPR_PTHREAD_FLAG := USE_PTHREADS=1
endif
@ -195,8 +195,8 @@ ifdef NEED_WITH_NSPR
CONFIG_FLAGS += --with-nspr=$(NSPR_INSTALL_DIR)
endif
ifeq "$(origin MOZ_WITH_PTHREADS)" "environment"
CONFIG_FLAGS += --with-pthreads
ifeq "$(origin MOZ_WITHOUT_PTHREADS)" "environment"
CONFIG_FLAGS += --without-pthreads
endif
#######################################################################