bug#17629: Can't build emacs-24 branch

[Jorgen Schaefer]

Building the current emacs-24 branch fails for me.

Latest commit (git ref, sorry, no bzr here):

3302b06 Do not mention individual ns options in the manual

In a fresh checkout and with a clean tree:

$ ./autogen.sh && ./configure --without-x && make clean && make

[...]

make[2]: Leaving directory `/home/forcer/Programs/Emacs/trunk/lisp'
if test "no" = "yes"; then \
          rm -f bootstrap-emacs; \
          ln temacs bootstrap-emacs; \
        else \
          ./temacs --batch --load loadup bootstrap || exit 1; \
          test "X" = X ||  -zex emacs; \
          mv -f emacs bootstrap-emacs; \
        fi
Loading loadup.el (source)...
Using load-path (/home/forcer/Programs/Emacs/trunk/lisp 
/home/forcer/Programs/Emacs/trunk/lisp/emacs-lisp 
/home/forcer/Programs/Emacs/trunk/lisp/language 
/home/forcer/Programs/Emacs/trunk/lisp/international 
/home/forcer/Programs/Emacs/trunk/lisp/textmodes 
/home/forcer/Programs/Emacs/trunk/lisp/vc)
Loading emacs-lisp/byte-run (compiled; note, source file is newer)...
Loading emacs-lisp/backquote...
Loading subr (compiled; note, source file is newer)...
Loading version...
Loading widget...
Loading custom...
Loading emacs-lisp/map-ynp...
Loading international/mule...
Loading international/mule-conf...
Loading env...
Loading format...
Loading bindings...
Loading cus-start (compiled; note, source file is newer)...
Note, built-in variable `report-emacs-bug-address' not bound
Loading window (compiled; note, source file is newer)...
Loading files (compiled; note, source file is newer)...
Loading emacs-lisp/macroexp (compiled; note, source file is newer)...
Loading cus-face (compiled; note, source file is newer)...
Loading faces (compiled; note, source file is newer)...
Loading button...
Loading startup (compiled; note, source file is newer)...
Loading /home/forcer/Programs/Emacs/trunk/lisp/loaddefs.el (source)...
Wrong number of arguments: (2 . 2), 1
make[1]: *** [bootstrap-emacs] Error 1
make[1]: Leaving directory `/home/forcer/Programs/Emacs/trunk/src'
make: *** [src] Error 2           


x86_64-unknown-linux-gnu
System Description:     Debian GNU/Linux 7.5 (wheezy)