bug#7859: build failure of trunk on mac os x

[emacs user]

a compilation problem during the past few days with trunk version

Configured for `x86_64-apple-darwin10.6.0'.

  Where should the build process find the source code?    /usr/local/emacs/trunk
  What operating system and machine description files should Emacs use?
        `s/darwin.h' and `m/amdx86-64.h'
  What compiler should emacs be built with?               gcc -g -O2
  Should Emacs use the GNU version of malloc?             no
    (The GNU allocators don't work with this system configuration.)
  Should Emacs use a relocating allocator for buffers?    no
  Should Emacs use mmap(2) for buffer allocation?         no
  What window system should Emacs use?                    nextstep
  What toolkit should Emacs use?                          none
  Where do we find X Windows header files?                NONE
  Where do we find X Windows libraries?                   NONE
  Does Emacs use -lXaw3d?                                 no
  Does Emacs use -lXpm?                                   no
  Does Emacs use -ljpeg?                                  no
  Does Emacs use -ltiff?                                  no
  Does Emacs use a gif library?                           no
  Does Emacs use -lpng?                                   no
  Does Emacs use -lrsvg-2?                                no
  Does Emacs use imagemagick?                             no
  Does Emacs use -lgpm?                                   no
  Does Emacs use -ldbus?                                  yes
  Does Emacs use -lgconf?                                 no
  Does Emacs use -lselinux?                               no
  Does Emacs use -lgnutls?                                yes
  Does Emacs use -lxml2?                                  yes
  Does Emacs use -lfreetype?                              no
  Does Emacs use -lm17n-flt?                              no
  Does Emacs use -lotf?                                   no
  Does Emacs use -lxft?                                   no
  Does Emacs use toolkit scroll bars?                     yes

...

gcc -c  -Demacs -DHAVE_CONFIG_H  -I. -I/usr/local/emacs/trunk/src
-I../lib -I/usr/local/emacs/trunk/src/../lib
-I/opt/local/include/libxml2   -I/opt/local/include/dbus-1.0
-I/opt/local/lib/dbus-1.0/include        -MMD -MF deps/unexmacosx.d
-I/opt/local/include   -Wimplicit-function-declaration
-Wold-style-definition -Wdeclaration-after-statement -Wno-pointer-sign
 -g -O2 unexmacosx.c
In file included from ../lib/unistd.h:110,
                 from unexmacosx.c:94:
../lib/getopt.h:196: error: redefinition of 'struct option'
make[1]: *** [unexmacosx.o] Error 1
make: *** [src] Error 2