Odd "-2.0/" argument in build because of "unix", on emacs-23 branch

[Stefan Monnier]

I just did a rebuild of the emacs-23 branch and noticed this error:

gcc -c -I/home/monnier/src/Xaw3d -Demacs -DHAVE_CONFIG_H  -I. 
-I/home/monnier/src/emacs/trunk/src -D_BSD_SOURCE -pthread 
-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 
-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-1 -2.0/ 
-I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 
-I/usr/include/alsa -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 
-I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo 
-I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 
-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -DORBIT2=1 -pthread 
-I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 
-I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
-Wall -Wno-pointer-sign -DUSE_LISP_UNION_TYPE -DSYNC_INPUT -DENABLE_CHECKING 
-DXASSERTS -DFONTSET_DEBUG -g -O0 -I/usr/include/GNUstep 
-I/usr/include/freetype2 -MMD -MF deps/dbusbind.d dbusbind.c
gcc: unrecognized option '-2.0/'

It seems to come from /usr/include/gio-unix-2.0/ where `unix' got turned
into a space.  Can someone backport the corresponding fix from the trunk?


        Stefan