Compiling with Xorg 7.0

[Bill Wohler]

I just upgraded to Xorg 7.0 (aka X11R7) over the weekend and now Emacs does not
compile. Now that Xorg complies with FHS, the /usr/X11R6 directory is
gone. I suspect that Emacs is looking for the various header files and
libraries in /usr/X11R6. (Granted, I just updated Emacs too, so
something might have changed in Emacs as well.)

Has anyone compiled Emacs with Xorg 7.0?

Here are some troubled lines in "make bootstrap".

gcc -c -D_BSD_SOURCE   -Demacs -DHAVE_CONFIG_H -DUSE_GTK  -I. 
-I/usr/local/src/mh-e/src/emacs/src -D_BSD_SOURCE -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/glib-2.0 -I/usr/lib/glib-2.0/include  
-g xmenu.c
In file included from xmenu.c:130:
gtkutil.h:163: error: syntax error before '*' token
gtkutil.h:165: warning: 'struct scroll_bar' declared inside parameter list
gtkutil.h:165: warning: its scope is only this definition or declaration, which 
is probably not what you want
gtkutil.h:179: warning: 'struct scroll_bar' declared inside parameter list
gtkutil.h:192: error: syntax error before '*' token
gtkutil.h:194: error: syntax error before 'Display'
gtkutil.h:195: error: syntax error before '*' token
gtkutil.h:196: error: syntax error before '*' token
gtkutil.h:204: error: syntax error before 'Pixmap'
xmenu.c: In function 'syms_of_xmenu':
xmenu.c:3774: error: 'Smenu_bar_open' undeclared (first use in this function)
xmenu.c:3774: error: (Each undeclared identifier is reported only once
xmenu.c:3774: error: for each function it appears in.)
make[2]: *** [xmenu.o] Error 1
make[2]: Leaving directory `/home/usr.local.src/mh-e/src/emacs/src'
make[1]: *** [bootstrap-build] Error 2
make[1]: Leaving directory `/home/usr.local.src/mh-e/src/emacs'
make: *** [bootstrap] Error 2

-- 
Bill Wohler <address@hidden>  http://www.newt.com/wohler/  GnuPG ID:610BD9AD