Mercurial > emacs
changeset 108523:81b3d413542e
Remove some unused #define's, previously replaced by variables.
* configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.
* src/Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp.
(LIBX_BASE): Use $LD_SWITCH_X_SITE.
* nt/config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs.
* msdos/sed1v2.inp: Comment.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 12 May 2010 20:18:04 -0700 |
| parents | 0d518077d6bd |
| children | 732a4fb5612e |
| files | ChangeLog configure.in msdos/sed1v2.inp nt/ChangeLog nt/config.nt src/ChangeLog src/Makefile.in |
| diffstat | 7 files changed, 29 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 12 19:50:20 2010 -0700 +++ b/ChangeLog Wed May 12 20:18:04 2010 -0700 @@ -1,3 +1,7 @@ +2010-05-13 Glenn Morris <rgm@gnu.org> + + * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. + 2010-05-12 Glenn Morris <rgm@gnu.org> * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.
--- a/configure.in Wed May 12 19:50:20 2010 -0700 +++ b/configure.in Wed May 12 20:18:04 2010 -0700 @@ -3012,6 +3012,7 @@ ### Use configuration here uncanonicalized to avoid exceeding size limits. AC_SUBST(version) AC_SUBST(configuration) +## Unused? AC_SUBST(canonical) AC_SUBST(srcdir) AC_SUBST(prefix) @@ -3033,6 +3034,9 @@ AC_SUBST(gamedir) AC_SUBST(gameuser) AC_SUBST(unexec) +## 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. AC_SUBST(LD_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SYSTEM) @@ -3060,18 +3064,6 @@ [Define to the used machine dependent file.]) AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", [Define to the used os dependent file.]) -AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE}, -[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.]) -AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}, -[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.]) XMENU_OBJ= XOBJ=
--- a/msdos/sed1v2.inp Wed May 12 19:50:20 2010 -0700 +++ b/msdos/sed1v2.inp Wed May 12 20:18:04 2010 -0700 @@ -46,6 +46,7 @@ /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +#/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@// /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
--- a/nt/ChangeLog Wed May 12 19:50:20 2010 -0700 +++ b/nt/ChangeLog Wed May 12 20:18:04 2010 -0700 @@ -1,3 +1,7 @@ +2010-05-13 Glenn Morris <rgm@gnu.org> + + * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released.
--- a/nt/config.nt Wed May 12 19:50:20 2010 -0700 +++ b/nt/config.nt Wed May 12 20:18:04 2010 -0700 @@ -1,6 +1,7 @@ /* GNU Emacs site configuration template file. -*- C -*- - Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -318,20 +319,6 @@ #define subprocesses -/* 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 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 STACK_DIRECTION here, but not if m/foo.h did. */ #ifndef STACK_DIRECTION #undef STACK_DIRECTION
--- a/src/ChangeLog Wed May 12 19:50:20 2010 -0700 +++ b/src/ChangeLog Wed May 12 20:18:04 2010 -0700 @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris <rgm@gnu.org> + * Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. + (LIBX_BASE): Use $LD_SWITCH_X_SITE. + * Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
--- a/src/Makefile.in Wed May 12 19:50:20 2010 -0700 +++ b/src/Makefile.in Wed May 12 20:18:04 2010 -0700 @@ -85,6 +85,15 @@ ## This is used before C_SWITCH_X_SYSTEM and may override it. C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ +## Define LD_SWITCH_X_SITE to contain any special flags your loader +## may need to deal with X Windows. For instance, if 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. Only used if +## HAVE_X_WINDOWS. +## FIXME? configure sets a value for this, but it has never been +## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE. +LD_SWITCH_X_SITE= + ## This holds any special options for linking temacs only (ie, not ## used by configure). Not used elsewhere because it sometimes ## contains options that have to do with using Emacs's crt0, @@ -241,11 +250,6 @@ do not let it interfere with this file. */ #undef register -/* This macro is for switches specifically related to X Windows. */ -#ifndef LD_SWITCH_X_SITE -#define LD_SWITCH_X_SITE -#endif - #ifdef NS_IMPL_GNUSTEP /* Pull in stuff from GNUstep-make. */ FOUNDATION_LIB=gnu @@ -296,7 +300,7 @@ #endif /* not HAVE_MENUS */ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) -LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE +LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ #endif /* not HAVE_X_WINDOWS */