Commit d09af540 authored by ramiro%netscape.com's avatar ramiro%netscape.com
Browse files

Simplify further. Use only one one variable to indicate whether NSPR is 

native or not.

Remove a bunch of AC_DEFINE() statements for a previous rpm support checkin
I made (it was not needed).  Use MOZ_ instead of MOZILLA_ to be consistent
with the rest of configure.in.

Added build/nsprenv.mk support.  Setting the NSPR environment via a file.
This doesnt work yet, since it needs 2 small tweaks to NSPR.

Added support for non native nspr.  Not turned on yet.  Until NSPR includes
2 small tweaks.

Since comments are free, added a bunch of them.
parent d1905e51

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ DIRS = \ 
  config			\

  $(NULL)



ifdef MOZ_BUILD_NSPR

ifndef MOZ_NATIVE_NSPR

DIRS +=				\

  nsprpub			\

  $(NULL)

allmakefiles.sh

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ base/src/rhapsody/Makefile 
base/src/gtk/Makefile

base/src/xlib/Makefile

base/tests/Makefile

build/nsprenv.mk

build/package/rpm/mozilla.spec

build/package/rpm/nspr-pthreads.spec

config/Makefile

build/package/rpm/mozilla.spec.in

+5 −5
Original line number Diff line number Diff line 
%define ver		@MOZILLA_RPM_VERSION@

%define rel		@MOZILLA_RPM_RELEASE@

%define prefix	@MOZILLA_RPM_PREFIX@

%define tmp		@MOZILLA_RPM_TMP@

%define ver		@MOZ_RPM_VERSION@

%define rel		@MOZ_RPM_RELEASE@

%define prefix	@MOZ_RPM_PREFIX@

%define tmp		@MOZ_RPM_TMP@



Summary:	Mozilla / ButtMonkey / Gecko / Whatever

Name:		mozilla
@@ -38,7 +38,7 @@ Mozilla development libs and headers 
			--with-pthreads \

			--enable-toolkit=gtk \

			--disable-build-nspr \

			@MOZILLA_RPM_SEAMONKEY_OPTIMIZE@

			@MOZ_RPM_SEAMONKEY_OPTIMIZE@



make

config/autoconf.mk.in

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
USE_AUTOCONF 	= 1

MOZILLA_CLIENT	= 1

NO_MDUPDATE	= 1

MOZ_NATIVE_NSPR = 1



MOZ_LIB_UTIL_PREFIX = moz

MOZ_LIB_JS_PREFIX   = moz
@@ -64,7 +63,7 @@ MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@ 


MOZ_BUILD_XPFE = @MOZ_BUILD_XPFE@

MOZ_NO_WALLET_HACK = @MOZ_BUILD_XPFE@

MOZ_BUILD_NSPR = @MOZ_BUILD_NSPR@

MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@



# Should the extra CFLAGS only be added in Makefile.ins that need them? 

OS_CFLAGS	= @CFLAGS@

config/config.mk

+32 −0
Original line number Diff line number Diff line
@@ -758,3 +758,35 @@ ifeq ($(USE_PTHREADS), 1) 
DEFINES += -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM

endif

endif #!USE_AUTOCONF



##

## If MOZ_NATIVE_NSPR is not set, then we are building with NSPR in

## the source tree (mozilla/nsprpub).

##

## We need to export these two variables into the environment so that

## make processes running on makefiles and code within nsprpub will

## have options/behavior compatible with stuff automatically set 

## by autoconf.

##

## NSPR_IGNORE_OBJDIR_FOR_DIST

## 

## Causes NSPR to ignore the OBJDIR variable when setting $(DIST), 

## so that it installs its stuff in 

##

## mozilla/dist/{bin,lib,include}

##

## (as mozilla does) instead of 

##

## mozilla/dist/$(OBJDIR)/{bin,lib,include}.

##

## NSPR_EXTRA_ENVIRONMENT

##

## Causes the NSPR build system to include the file build/nsprenv.mk

## into its build environment.  This file is autoconf genereated 

## from mozilla/build/nsprenv.mk.in and will contain the environment

## needed to build an NSPR that compatible with mozilla as detected

## by autoconf.

ifndef MOZ_NATIVE_NSPR

export NSPR_IGNORE_OBJDIR_FOR_DIST = 1

export NSPR_EXTRA_ENVIRONMENT=build/nsprenv.mk

endif