Commit 0116466b authored by Glenn Morris's avatar Glenn Morris

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.
parent 5a903aa9
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> 2010-05-12 Glenn Morris <rgm@gnu.org>
* configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused. * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.
......
...@@ -3012,6 +3012,7 @@ fi ...@@ -3012,6 +3012,7 @@ fi
### Use configuration here uncanonicalized to avoid exceeding size limits. ### Use configuration here uncanonicalized to avoid exceeding size limits.
AC_SUBST(version) AC_SUBST(version)
AC_SUBST(configuration) AC_SUBST(configuration)
## Unused?
AC_SUBST(canonical) AC_SUBST(canonical)
AC_SUBST(srcdir) AC_SUBST(srcdir)
AC_SUBST(prefix) AC_SUBST(prefix)
...@@ -3033,6 +3034,9 @@ AC_SUBST(bitmapdir) ...@@ -3033,6 +3034,9 @@ AC_SUBST(bitmapdir)
AC_SUBST(gamedir) AC_SUBST(gamedir)
AC_SUBST(gameuser) AC_SUBST(gameuser)
AC_SUBST(unexec) 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(LD_SWITCH_X_SITE)
AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SITE)
AC_SUBST(C_SWITCH_X_SYSTEM) AC_SUBST(C_SWITCH_X_SYSTEM)
...@@ -3060,18 +3064,6 @@ AC_DEFINE_UNQUOTED(config_machfile, "${machfile}", ...@@ -3060,18 +3064,6 @@ AC_DEFINE_UNQUOTED(config_machfile, "${machfile}",
[Define to the used machine dependent file.]) [Define to the used machine dependent file.])
AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
[Define to the used os dependent file.]) [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= XMENU_OBJ=
XOBJ= XOBJ=
......
...@@ -46,6 +46,7 @@ s/\.h\.in/.h-in/ ...@@ -46,6 +46,7 @@ s/\.h\.in/.h-in/
/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// /^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// /^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_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
......
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> 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.2 released. * Version 23.2 released.
......
/* GNU Emacs site configuration template file. -*- C -*- /* 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. This file is part of GNU Emacs.
...@@ -318,20 +319,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -318,20 +319,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define subprocesses #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. */ /* Define STACK_DIRECTION here, but not if m/foo.h did. */
#ifndef STACK_DIRECTION #ifndef STACK_DIRECTION
#undef STACK_DIRECTION #undef STACK_DIRECTION
......
2010-05-13 Glenn Morris <rgm@gnu.org> 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) * Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
......
...@@ -85,6 +85,15 @@ C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ ...@@ -85,6 +85,15 @@ C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@
## This is used before C_SWITCH_X_SYSTEM and may override it. ## This is used before C_SWITCH_X_SYSTEM and may override it.
C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ 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 ## This holds any special options for linking temacs only (ie, not
## used by configure). Not used elsewhere because it sometimes ## used by configure). Not used elsewhere because it sometimes
## contains options that have to do with using Emacs's crt0, ## contains options that have to do with using Emacs's crt0,
...@@ -241,11 +250,6 @@ DEPFLAGS = -MMD -MF deps/$*.d ...@@ -241,11 +250,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
do not let it interfere with this file. */ do not let it interfere with this file. */
#undef register #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 #ifdef NS_IMPL_GNUSTEP
/* Pull in stuff from GNUstep-make. */ /* Pull in stuff from GNUstep-make. */
FOUNDATION_LIB=gnu FOUNDATION_LIB=gnu
...@@ -296,7 +300,7 @@ LIBXMENU= ...@@ -296,7 +300,7 @@ LIBXMENU=
#endif /* not HAVE_MENUS */ #endif /* not HAVE_MENUS */
LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
LIBX_OTHER=@LIBX_OTHER@ LIBX_OTHER=@LIBX_OTHER@
#endif /* not HAVE_X_WINDOWS */ #endif /* not HAVE_X_WINDOWS */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment