FTBFS: X11 library from freedesktop.org

[bddebian]

Heya folks,

OK, I am trying to build the libraries from the unstable branch of 
freedesktop.org.  When building the X11 library, I get the following:

if /bin/sh ../libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.    
-include config.h -I../include -I../include/X11 -Wall -Wpointer-arith 
-Wstrict-prototypes       -Wmissing-prototypes -Wmissing-declarations     
-Wnested-externs -fno-strict-aliasing -I/opt/fdo/include 
-I/opt/fdo/include/X11/Xtrans   -I/opt/fdo/include   -DXTHREADS 
-DXUSE_MTSAFE_API  -DX11_DATADIR='"/opt/fdo/share/X11"' -g -O2 -MT GetDflt.lo 
-MD -MP -MF ".deps/GetDflt.Tpo" -c -o GetDflt.lo GetDflt.c; \
then mv -f ".deps/GetDflt.Tpo" ".deps/GetDflt.Plo"; else rm -f 
".deps/GetDflt.Tpo"; exit 1; fi
rm: cannot remove `': Invalid argument
 gcc -DHAVE_CONFIG_H -I. -I. -I. -include config.h -I../include 
-I../include/X11 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing -I/opt/fdo/include 
-I/opt/fdo/include/X11/Xtrans -I/opt/fdo/include -DXTHREADS -DXUSE_MTSAFE_API 
-DX11_DATADIR=\"/opt/fdo/share/X11\" -g -O2 -MT GetDflt.lo -MD -MP -MF 
.deps/GetDflt.Tpo -c GetDflt.c  -fPIC -DPIC -o .libs/GetDflt.o
GetDflt.c: In function `GetHomeDir':
GetDflt.c:129: error: too few arguments to function `getpwnam_r'
GetDflt.c:131: error: too few arguments to function `getpwuid_r'
make[3]: *** [GetDflt.lo] Error 1
make[3]: Leaving directory `/src/bdefreese/X11/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/src/bdefreese/X11/src'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/src/bdefreese/X11/src'
make: *** [all-recursive] Error 1


I have seen this mentioned several times on some of the ML archives but no 
specific fix.  Any thoughts?

Thanks!

Barry deFreese (aka bddebian)