Update build to use nspr.m4.

Start using nspr-config to set NSPR_CFLAGS & NSPR_LIBS. Start placing nspr headers under $(DIST)/include/nspr to match a system installed NSPR. Bug #73919 [email protected]
dothq · Apr 7, 2001 · a39e7ef · a39e7ef
1 parent f332609
commit a39e7ef
Show file tree

Hide file tree

Showing 5 changed files with 655 additions and 832 deletions.
diff --git a/aclocal.m4 b/aclocal.m4
@@ -7,6 +7,7 @@ builtin(include, build/autoconf/glib.m4)dnl
 builtin(include, build/autoconf/gtk.m4)dnl
 builtin(include, build/autoconf/gdk-pixbuf.m4)dnl
 builtin(include, build/autoconf/libIDL.m4)dnl
+builtin(include, build/autoconf/nspr.m4)dnl
 dnl
 define(MOZ_TOPSRCDIR,.)dnl MOZ_TOPSRCDIR is used in altoptions.m4
 builtin(include, build/autoconf/altoptions.m4)dnl

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
@@ -241,7 +241,6 @@ endif
 
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
-NSPR_INCLUDE_DIR= @NSPR_INCLUDE_DIR@
 
 # MKSHLIB_FORCE_ALL is used to force the linker to include all object
 # files present in an archive. MKSHLIB_UNFORCE_ALL reverts the linker

diff --git a/config/config.mak b/config/config.mak
@@ -126,7 +126,7 @@ NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
 
 CFGFILE=$(OBJDIR)\cmd.cfg
 
-INCS=$(INCS) -I$(PUBLIC) -I$(DIST)\include
+INCS=$(INCS) -I$(PUBLIC) -I$(DIST)\include -I$(PUBLIC)\nspr
 
 !if "$(MOZ_BITS)" == "16"
 CFLAGS=$(MOZ_JAVA_FLAG) -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)