Removed --enable-nspr. Added check for moc.

Makefile.in

@@ -23,19 +23,14 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 NSPRDIR		= $(topsrcdir)/nsprpub
-NSPRDIR_AC	= nsprpub
 NSPR20		= 1
-NSPR_MAKE_ARGS	= -C $(NSPRDIR) DIST=`pwd`/dist CC=$(CC) CCC=$(CXX) MOZILLA_CLIENT=$(MOZILLA_CLIENT) MOZ_DEBUG=$(MOZ_DEBUG) USE_PTHREADS=$(USE_PTHREADS) BUILD_OPT=$(BUILD_OPT) NO_MDUPDATE=$(NO_MDUPDATE) $@
+NSPR_MAKE_ARGS	= -C $(NSPRDIR) DIST=`pwd`/dist NS_USE_GCC=$(GNU_CC) MOZILLA_CLIENT=$(MOZILLA_CLIENT) MOZ_DEBUG=$(MOZ_DEBUG) USE_PTHREADS=$(USE_PTHREADS) BUILD_OPT=$(BUILD_OPT) NO_MDUPDATE=$(NO_MDUPDATE) $@
 
 ifndef NO_MOCHA
 DIRS_JS		= js
 endif
 
-DIRS		= config coreconf 
-ifdef NSPR_AUTOCONF
-DIRS		+= $(NSPRDIR_AC)
-endif
-DIRS		+= dbm xpcom base network caps
+DIRS		= config coreconf dbm xpcom base network caps
 
 ifndef MOZ_NATIVE_JPEG
 DIRS		+= jpeg
@@ -71,7 +66,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef NSPR_AUTOCONF
 export:: envirocheck $(OBJS)
 	$(MAKE) $(NSPR_MAKE_ARGS)
 
@@ -93,8 +87,6 @@ clobber::
 clobber_all::
 	$(MAKE) $(NSPR_MAKE_ARGS)
 
-endif # !NSPR_AUTOCONF
-	
 # Running this rule assembles all the SDK source pieces into dist/sdk.
 # You'll need to run this rule on every platform to get all the
 # binaries (e.g. javah) copied there. You'll also have to do special

config/autoconf.mk.in

@@ -45,7 +45,6 @@ USE_PTHREADS	= @USE_PTHREADS@
 MOZ_MAIL_COMPOSE = @MOZ_MAIL_COMPOSE@
 FULL_STATIC_BUILD = @FULL_STATIC_BUILD@
 NO_UNIX_LDAP	= @NO_UNIX_LDAP@
-NSPR_AUTOCONF	= @NSPR_AUTOCONF@
 
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
@@ -66,6 +65,7 @@ ACRANLIB	= @RANLIB@
 ACWHOAMI	= @WHOAMI@
 ACUNZIP		= @UNZIP@
 ACZIP		= @ZIP@
+MOC		= @MOC@
 
 OBJDIR_TAG	= _AC
 OBJDIR_NAME	= .

configure.in

@@ -398,50 +398,6 @@ AC_ARG_ENABLE(ldap,
 	    NO_UNIX_LDAP=
 	fi] )
 
-AC_ARG_ENABLE(nspr,
-[  --enable-nspr           enable use of autoconf nspr files (depreciated) ],
-        [if test "$enableval" = "yes"; then
-	    NSPR_AUTOCONF=1
-NSPR_MAKEFILES="
-nsprpub/Makefile
-nsprpub/config/Makefile
-nsprpub/config/autoconf.mk
-nsprpub/lib/Makefile
-nsprpub/lib/ds/Makefile
-nsprpub/lib/libc/Makefile
-nsprpub/lib/libc/include/Makefile
-nsprpub/lib/libc/src/Makefile
-nsprpub/lib/msgc/Makefile
-nsprpub/lib/msgc/include/Makefile
-nsprpub/lib/msgc/src/Makefile
-nsprpub/lib/msgc/tests/Makefile
-nsprpub/lib/prstreams/Makefile
-nsprpub/lib/tests/Makefile
-nsprpub/pr/Makefile
-nsprpub/pr/include/Makefile
-nsprpub/pr/include/md/Makefile
-nsprpub/pr/include/obsolete/Makefile
-nsprpub/pr/include/private/Makefile
-nsprpub/pr/src/Makefile
-nsprpub/pr/src/io/Makefile
-nsprpub/pr/src/linking/Makefile
-nsprpub/pr/src/malloc/Makefile
-nsprpub/pr/src/md/Makefile
-nsprpub/pr/src/md/os2/Makefile
-nsprpub/pr/src/md/unix/Makefile
-nsprpub/pr/src/md/windows/Makefile
-nsprpub/pr/src/memory/Makefile
-nsprpub/pr/src/misc/Makefile
-nsprpub/pr/src/pthreads/Makefile
-nsprpub/pr/src/threads/Makefile
-nsprpub/pr/src/threads/combined/Makefile
-nsprpub/pr/tests/Makefile
-nsprpub/pr/tests/dll/Makefile
-nsprpub/pr/tests/w16gui/Makefile
-nsprpub/tools/Makefile
-"
-	fi ] )
-
 AC_SUBST(MOZ_FE)
 AC_SUBST(MOZ_SECURITY)
 AC_SUBST(NO_SECURITY)
@@ -464,7 +420,6 @@ AC_SUBST(USE_PTHREADS)
 AC_SUBST(MOZ_MAIL_COMPOSE)
 AC_SUBST(FULL_STATIC_BUILD)
 AC_SUBST(NO_UNIX_LDAP)
-AC_SUBST(NSPR_AUTOCONF)
 
 dnl Checks for X libraries.
 dnl Ordering is important.
@@ -510,6 +465,7 @@ if [ test $res != 0 ]; then
     AC_CHECK_LIB(qt, set_new_handler, 
 	[FE_QT_LIBS="-lqt" FE_QT_CFLAGS='-I$(QTDIR)/include'],
 	[MISSING_QT=1])
+    AC_PATH_PROG(MOC, moc, /bin/true)
 fi
 
 res=`echo :$MOZ_FE | grep -c " gtk"`