Merge branch 'master' into next

* master:
  * DDon't default to using -j4 in MAKEFLAGS, instead add a MAKEJOBS param
  * Update bdlib

Makefile.in

@@ -54,7 +54,7 @@ _CFLGS = -fno-strict-aliasing -W -Wformat \
 #-Wconversion
 #-Wtraditional
 
-MAKEFLAGS = -s -j4
+MAKEFLAGS = -s @MAKEJOBS@
 
 MAKE_BIN = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \

autotools/configure.ac

@@ -63,6 +63,8 @@ EGG_CHECK_RANDOM_MAX
 EGG_CHECK_CCSTATIC
 AC_SUBST(CCDEBUG)dnl
 
+AC_SUBST(MAKEJOBS)dnl
+
 #checkpoint
 AC_CACHE_SAVE 
 

configure

@@ -648,6 +648,7 @@ VERSION
 LIBOBJS
 SSL_LIBS
 SSL_INCLUDES
+MAKEJOBS
 CCDEBUG
 STATIC
 BUILDARCH

doc/UPDATES

@@ -5,6 +5,7 @@
 * cmd_die no longer puts user's nick into the quit msg.
 * Update rbl list, 'set -yes rbl-servers -' to get new list.
 * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+* Fix default compile so it doesn't use a ton of processes.
 * Fix problems with changing IP
 * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
 

lib/bdlib

@@ -1 +1 @@
-Subproject commit ab9ed46ba1f3e9e4810ff789fc61832c19db2d55
+Subproject commit 809a1b480689051ba6bc3e3a7e718d7d7b3586e8