Mercurial > emacs
diff configure @ 108532:393e918b64f9
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 13 May 2010 05:57:58 +0000 |
| parents | f3d57f9fdf9f |
| children | 7ed2fb419f40 |
line wrap: on
line diff
--- a/configure Thu May 13 03:59:53 2010 +0000 +++ b/configure Thu May 13 05:57:58 2010 +0000 @@ -26313,27 +26313,31 @@ ### Use configuration here uncanonicalized to avoid exceeding size limits. - - - - - - - - - - - - - - - - - - - - - +## Unused? + + + + + + + + + + + + + + + + + + + + + +## FIXME? Nothing uses @LD_SWITCH_X_SITE@. +## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the +## end of LIBX_BASE, but nothing ever set it. @@ -26374,16 +26378,6 @@ _ACEOF -cat >>confdefs.h <<_ACEOF -#define LD_SWITCH_X_SITE ${LD_SWITCH_X_SITE} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define C_SWITCH_X_SITE ${C_SWITCH_X_SITE} -_ACEOF - - XMENU_OBJ= XOBJ= if test "${HAVE_X_WINDOWS}" = "yes" ; then @@ -26480,7 +26474,7 @@ LIBX_OTHER= fi -if test "$HAVE_GTK" = "yes"; then +if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= fi