diff options
| author | Glenn Morris | 2010-05-03 20:13:35 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-03 20:13:35 -0700 |
| commit | 27a2cdfc50abe67b29740b1230559fa7d7142c22 (patch) | |
| tree | ef7fc5db07c148685d5f24f953fb066bb7478e70 /src/s/gnu-linux.h | |
| parent | eb21eab59bbe301074cf478f43743d335254d97e (diff) | |
| download | emacs-27a2cdfc50abe67b29740b1230559fa7d7142c22.tar.gz emacs-27a2cdfc50abe67b29740b1230559fa7d7142c22.zip | |
Move LD_SWITCH_X_SITE_AUX from cpp to autoconf.
* configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE as well.
(LD_SWITCH_X_SITE_AUX_RPATH): New output variable.
* nt/config.nt (LD_SWITCH_X_SITE_AUX): Remove.
* src/s/gnu-linux.h (LD_SWITCH_SYSTEM): Use LD_SWITCH_X_SITE_AUX as a shell
variable.
* src/s/netbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH.
* src/s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH instead of
LD_SWITCH_SYSTEM_tmp.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH):
New variables, set by configure.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 948f96a1e40..73241f0c21f 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* This file is the configuration file for Linux-based GNU systems | 1 | /* This file is the configuration file for Linux-based GNU systems |
| 2 | Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, | 2 | Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, |
| 3 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | 2005, 2006, 2007, 2008, 2009, 2010 |
| 4 | Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -171,12 +172,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 171 | #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o | 172 | #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o |
| 172 | 173 | ||
| 173 | /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option | 174 | /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option |
| 174 | says where to find X windows at run time. */ | 175 | that says where to find X windows at run time. */ |
| 175 | 176 | ||
| 176 | #ifdef __mips__ | 177 | #ifdef __mips__ |
| 177 | #define LD_SWITCH_SYSTEM -G 0 LD_SWITCH_X_SITE_AUX | 178 | #define LD_SWITCH_SYSTEM -G 0 $(LD_SWITCH_X_SITE_AUX) |
| 178 | #else | 179 | #else |
| 179 | #define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX | 180 | #define LD_SWITCH_SYSTEM $(LD_SWITCH_X_SITE_AUX) |
| 180 | #endif /* __mips__ */ | 181 | #endif /* __mips__ */ |
| 181 | 182 | ||
| 182 | #ifdef emacs | 183 | #ifdef emacs |
| @@ -192,11 +193,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 192 | #define LIB_GCC | 193 | #define LIB_GCC |
| 193 | #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o | 194 | #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
| 194 | 195 | ||
| 195 | /* _BSD_SOURCE is redundant, at least in glibc2, since we define | ||
| 196 | _GNU_SOURCE. Left in in case it's relevant to libc5 systems and | ||
| 197 | anyone's still using Emacs on those. --fx 2002-12-14 */ | ||
| 198 | /* #define C_SWITCH_SYSTEM -D_BSD_SOURCE */ | ||
| 199 | |||
| 200 | #ifdef HAVE_LIBNCURSES | 196 | #ifdef HAVE_LIBNCURSES |
| 201 | #define TERMINFO | 197 | #define TERMINFO |
| 202 | #define LIBS_TERMCAP -lncurses | 198 | #define LIBS_TERMCAP -lncurses |