Mercurial > emacs
changeset 108532:393e918b64f9
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 13 May 2010 05:57:58 +0000 |
| parents | 4ab372e65d32 (current diff) 6fafd89a8318 (diff) |
| children | de6d3e5f8e8e |
| files | |
| diffstat | 4 files changed, 30 insertions(+), 55 deletions(-) [+] |
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
--- a/src/ChangeLog Thu May 13 03:59:53 2010 +0000 +++ b/src/ChangeLog Thu May 13 05:57:58 2010 +0000 @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris <rgm@gnu.org> + * Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file. + (lisp): Remove WINNT_SUPPORT. + * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]: Let configure set these variables (to empty) in this case as well. @@ -11,7 +14,7 @@ (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM) (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold - the values output be configure. + the values output by configure. (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables. 2010-05-12 Glenn Morris <rgm@gnu.org>
--- a/src/Makefile.in Thu May 13 03:59:53 2010 +0000 +++ b/src/Makefile.in Thu May 13 05:57:58 2010 +0000 @@ -436,15 +436,6 @@ #define WINDOW_SUPPORT #endif -#ifdef WINDOWSNT -#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ - ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ - ${lispsource}w32-fns.elc ${lispsource}term/common-win.elc \ - ${lispsource}term/w32-win.elc -#else -#define WINNT_SUPPORT -#endif - #ifdef HAVE_WINDOW_SYSTEM #define TOOLTIP_SUPPORT ${lispsource}tooltip.elc #else @@ -549,7 +540,6 @@ ${lispsource}epa-hook.elc \ TOOLTIP_SUPPORT \ MSDOS_SUPPORT \ - WINNT_SUPPORT \ WINDOW_SUPPORT \ ${NS_SUPPORT} \ ${lispsource}widget.elc \
--- a/src/config.in Thu May 13 03:59:53 2010 +0000 +++ b/src/config.in Thu May 13 05:57:58 2010 +0000 @@ -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 <sys/dg_sys_info.h>. */ #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