bug#10108: 24.0.91; Fails to build today's bzr update

[John ff]

Did bzr update and it has conflicts in lib/getopt.h
(sent from previous build)

136> make
[ -r "/jpff/GNU_21/emacs/trunk/src/config.in" ] || ( cd 
/jpff/GNU_21/emacs/trunk && autoheader )
cd lib; make all                            \
  CC='gcc -std=gnu99' CFLAGS='-g -O2' CPPFLAGS='' \
  LDFLAGS='-Wl,-znocombreloc ' MAKE='make'
make[1]: Entering directory `/jpff/GNU_21/emacs/trunk/lib'
make  all-am
make[2]: Entering directory `/jpff/GNU_21/emacs/trunk/lib'
make[2]: Nothing to be done for `all-am'.
make[2]: Leaving directory `/jpff/GNU_21/emacs/trunk/lib'
make[1]: Leaving directory `/jpff/GNU_21/emacs/trunk/lib'
cd lib-src; make all                            \
  CC='gcc -std=gnu99' CFLAGS='-g -O2' CPPFLAGS='' \
  LDFLAGS='-Wl,-znocombreloc ' MAKE='make'
make[1]: Entering directory `/jpff/GNU_21/emacs/trunk/lib-src'
gcc -std=gnu99   -Wimplicit-function-declaration -Wold-style-definition 
-Wdeclaration-after-statement  -DHAVE_CONFIG_H -I. -I../src -I../lib 
-I/jpff/GNU_21/emacs/trunk/lib-src -I/jpff/GNU_21/emacs/trunk/lib-src/../src 
-I/jpff/GNU_21/emacs/trunk/lib-src/../lib  -Wl,-znocombreloc   -g -O2 
/jpff/GNU_21/emacs/trunk/lib-src/emacsclient.c \
   -DVERSION="\"24.0.91\"" \
   ../lib/libgnu.a  -o emacsclient
In file included from /jpff/GNU_21/emacs/trunk/lib-src/emacsclient.c:76:0:
../lib/getopt.h:196:8: error: redefinition of ‘struct option’
/usr/include/getopt.h:106:8: note: originally defined here
../lib/getopt.h:245:12: error: conflicting types for ‘getopt_long’
/usr/include/getopt.h:175:12: note: previous declaration of ‘getopt_long’ 
was here
../lib/getopt.h:249:12: error: conflicting types for ‘getopt_long_only’
/usr/include/getopt.h:179:12: note: previous declaration of 
‘getopt_long_only’ was here
make[1]: *** [emacsclient] Error 1
make[1]: Leaving directory `/jpff/GNU_21/emacs/trunk/lib-src'
make: *** [lib-src] Error 2



In GNU Emacs 24.0.91.8 (x86_64-suse-linux-gnu, GTK+ Version 2.22.1)
 of 2011-11-18 on xenakis
Windowing system distributor `The X.Org Foundation', version 11.0.10903000
Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_GB.UTF-8
  value of $XMODIFIERS: @im=local
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: C/l

Minor modes in effect:
  auto-image-file-mode: t
  show-paren-mode: t
  display-time-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t
  abbrev-mode: t

Recent input:
<help-echo> <help-echo> <help-echo> <help-echo> C-x 
C-f G N U <tab> 2 <tab> e m <tab> / t r <tab> <return> 
<help-echo> <down-mouse-1> <mouse-1> <return> <help-echo> 
<down-mouse-1> <mouse-1> <return> <end> <next> <next> 
<next> <next> <next> <prior> <prior> <up> <up> <up> 
<up> <up> <up> <up> <up> <up> <up> <up> <up> <up> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> M-x e m a c s - r <tab> <backspace> <backspace> 
<backspace> <backspace> <backspace> <backspace> <backspace> 
r e p <tab> p o <backspace> <backspace> o <tab> r <tab> 
<return>

Recent messages:
Source file `/bigdisk/jpff/GNU_21/emacs/trunk/lisp/progmodes/cc-vars.el' newer 
than byte-compiled file
Source file `/bigdisk/jpff/GNU_21/emacs/trunk/lisp/progmodes/cc-engine.el' 
newer than byte-compiled file
Source file `/bigdisk/jpff/GNU_21/emacs/trunk/lisp/progmodes/cc-cmds.el' newer 
than byte-compiled file
Source file `/bigdisk/jpff/GNU_21/emacs/trunk/lisp/progmodes/cc-menus.el' newer 
than byte-compiled file
Source file `/bigdisk/jpff/GNU_21/emacs/trunk/lisp/progmodes/cc-fonts.el' newer 
than byte-compiled file
Loading vc-bzr...done
Making completion list...
Source file `/bigdisk/jpff/GNU_21/emacs/trunk/lisp/help-mode.el' newer than 
byte-compiled file
Making completion list...
goto-history-element: End of history; no default available

Load-path shadows:
/bigdisk/jpff/GNU_21/local-lisp/autotest-mode hides 
/usr/local/share/emacs/site-lisp/autotest-mode
/bigdisk/jpff/GNU_21/local-lisp/autoconf-mode hides 
/usr/local/share/emacs/site-lisp/autoconf-mode
/bigdisk/jpff/GNU_21/local-lisp/ses hides 
/bigdisk/jpff/GNU_21/emacs/trunk/lisp/ses
/bigdisk/jpff/GNU_21/local-lisp/socks hides 
/bigdisk/jpff/GNU_21/emacs/trunk/lisp/net/socks

Features:
(shadow mailabbrev mailalias mailcrypt mail-extr comint ring sendmail
rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils emacsbug
help-mode view vc-bzr imenu cc-mode cc-fonts cc-guess cc-menus cc-cmds
cc-styles cc-align cc-engine cc-vars cc-defs dired-add dired eldoc
delsel image-file cus-start cus-load logger crypt crypt++
crypt+pgp-pub paren uniquify advice help-fns advice-preload holidays
hol-loaddefs regexp-opt cal-menu easymenu calendar cal-loaddefs time
time-date tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win
x-dnd tool-bar dnd fontset image fringe lisp-mode register page
menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock
syntax facemenu font-core frame cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer
loaddefs button faces cus-face files text-properties overlay sha1 md5
base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process
dynamic-setting system-font-setting font-render-setting move-toolbar
gtk x-toolkit x multi-tty emacs)

==John ffitch