Commit 96128cef authored by cls%seawood.org's avatar cls%seawood.org
Browse files

Turned FULL_STATIC_BUILD on by default. Turn it off via --enable switches:... 

Turned FULL_STATIC_BUILD on by default. Turn it off via --enable switches: min-shared, oji, or java.  Turned unix ldap off by default.  Added kludge to build NSPR with a separate build process.  Added temp --enable-nspr to allow users to still use autoconf for NSPR build.
parent d7ae8929

Makefile.in

+33 −6
Original line number Diff line number Diff line
@@ -22,15 +22,20 @@ VPATH = @srcdir@ 


include $(DEPTH)/config/autoconf.mk



NSPRDIR		= nsprpub

NSPRDIR		= $(topsrcdir)/nsprpub

NSPRDIR_AC	= nsprpub

NSPR20		= 1

MOZILLA_CLIENT	= 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) $@



ifndef NO_MOCHA

DIRS_JS		= js

endif



DIRS		= config coreconf $(NSPRDIR) dbm xpcom base network caps

DIRS		= config coreconf 

ifdef NSPR_AUTOCONF

DIRS		+= $(NSPRDIR_AC)

endif

DIRS		+= dbm xpcom base network caps



ifndef MOZ_NATIVE_JPEG

DIRS		+= jpeg
@@ -55,7 +60,7 @@ DIRS += privacy 
DIRS		+= modules lib l10n cmd



ifeq ($(STAND_ALONE_JAVA),1)

DIRS		= config lib/xp $(NSPRDIR) sun-java ifc js ifc/tools sun-java/java

DIRS		= config lib/xp sun-java ifc js ifc/tools sun-java/java

ifndef MOZ_NATIVE_JPEG

DIRS		+= jpeg

endif
@@ -64,9 +69,31 @@ DIRS += modules/zlib 
endif

endif



include $(topsrcdir)/config/rules.mk



ifndef NSPR_AUTOCONF

export:: envirocheck $(OBJS)

	$(MAKE) $(NSPR_MAKE_ARGS)



libs::

	$(MAKE) $(NSPR_MAKE_ARGS)

               

install::

	$(MAKE) $(NSPR_MAKE_ARGS)

               

clean::

	$(MAKE) $(NSPR_MAKE_ARGS)

               

realclean::

	$(MAKE) $(NSPR_MAKE_ARGS)



clobber::

	$(MAKE) $(NSPR_MAKE_ARGS)

               

clobber_all::

	$(MAKE) $(NSPR_MAKE_ARGS)



endif # !NSPR_AUTOCONF

	

include $(topsrcdir)/config/rules.mk



# 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

config/autoconf.mk.in

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


USE_AUTOCONF 	= 1

MOZILLA_CLIENT	= 1

MOZ_MEDIUM	= 1

NO_MDUPDATE	= 1



MOZ_FE		= @MOZ_FE@
@@ -44,6 +43,9 @@ SMART_MAIL = @MOZ_SMART_MAIL@ 
DOM		= @MOZ_DOM@

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@

configure.in

+66 −37
Original line number Diff line number Diff line
@@ -262,6 +262,13 @@ done 
echo "Using FE:${MOZ_FE}."

unset fe_list



FULL_STATIC_BUILD=1

AC_ARG_ENABLE(min-shared,

[  --enable-min-shared     enable use of minimal internal dynamic libs ],

        [if test "$enableval" = "yes"; then

	    FULL_STATIC_BUILD=

        fi] )



AC_ARG_ENABLE(crypto,

[  --enable-crypto	  enable use of SSL (untested)],

	[if test "$enableval" = "yes"; then
@@ -283,12 +290,14 @@ AC_ARG_ENABLE(java, 
[  --enable-java           enable use of java applets (untested)],

	[if test "$enableval" = "yes"; then

	    MOZ_JAVA=1

	    FULL_STATIC_BUILD=

	fi] )



AC_ARG_ENABLE(oji,

[  --enable-oji            enable use of Open JVM Interface (untested)],

	[if test "$enableval" = "yes"; then

	    MOZ_OJI=1

	    FULL_STATIC_BUILD=

	fi] )



AC_ARG_ENABLE(debug,
@@ -376,12 +385,63 @@ AC_ARG_ENABLE(pthreads, 
        fi] )



AC_ARG_ENABLE(mail-compose,

[  --enable-mail-compose   enable old Messenger mail composer (broken)],

[  --enable-mail-compose   enable old Messenger mail composer ],

	[if test "$enableval" = "yes"; then

	    MOZ_MAIL_COMPOSE=1

	    NO_EDITOR=

	fi])



NO_UNIX_LDAP=1

AC_ARG_ENABLE(ldap,

[  --enable-ldap           enable ldap ],

	[if test "$enableval" = "yes"; then

	    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)
@@ -402,6 +462,9 @@ AC_SUBST(MOZ_SMART_MAIL) 
AC_SUBST(MOZ_DOM)

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.
@@ -612,6 +675,7 @@ cmd/gnomefe/gnome-widgets/Makefile" 
    fi

fi





AC_OUTPUT(

Makefile

base/Makefile
@@ -793,42 +857,7 @@ network/protocol/pop3/Makefile 
network/protocol/remote/Makefile

network/protocol/smtp/Makefile

network/util/Makefile

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

$NSPR_MAKEFILES

privacy/Makefile

privacy/public/Makefile

privacy/src/Makefile