# HG changeset patch # User Glenn Morris # Date 1273723097 25200 # Node ID f3d57f9fdf9f66095d207299417e88b94049e94f # Parent 25f3a5a76921f51614dbe65c49decdb31a9a2cb3 Regenerate configure, src/config.in. diff -r 25f3a5a76921 -r f3d57f9fdf9f configure --- a/configure Wed May 12 20:55:46 2010 -0700 +++ b/configure Wed May 12 20:58:17 2010 -0700 @@ -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 diff -r 25f3a5a76921 -r f3d57f9fdf9f src/config.in --- a/src/config.in Wed May 12 20:55:46 2010 -0700 +++ b/src/config.in Wed May 12 20:58:17 2010 -0700 @@ -44,12 +44,6 @@ /* Define to 1 if using `getloadavg.c'. */ #undef C_GETLOADAVG -/* Define C_SWITCH_X_SITE to contain any special flags your compiler may need - to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS - above and your X include files aren't in a place that your compiler can - find on its own, you might want to add "-I/..." or something similar. */ -#undef C_SWITCH_X_SITE - /* Define to 1 for DGUX with . */ #undef DGUX @@ -804,12 +798,6 @@ /* Define to use Kerberos 5 instead of Kerberos 4. */ #undef KERBEROS5 -/* Define LD_SWITCH_X_SITE to contain any special flags your loader may need - to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS - above and your X libraries aren't in a place that your loader can find on - its own, you might want to add "-L/..." or something similar. */ -#undef LD_SWITCH_X_SITE - /* Define to 1 if localtime caches TZ. */ #undef LOCALTIME_CACHE