diff src/s/gnu-linux.h @ 108278:9c003610b6fc

Move LD_SWITCH_SYSTEM from cpp to configure. * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp. Merges logic from src/s/* and src/Makefile.in. (LD_SWITCH_SYSTEM_TEMACS): New output variable. * src/Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp. (LD_SWITCH_SYSTEM_EXTRA): New variable, set by configure. (TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM and $LD_SWITCH_SYSTEM_EXTRA, move out of cpp section. * src/s/freebsd.h (LD_SWITCH_SYSTEM): * src/s/gnu-linux.h (LD_SWITCH_SYSTEM): * src/s/netbsd.h (LD_SWITCH_SYSTEM): * admin/CPP-DEFINES: Remove LD_SWITCH_SYSTEM.

--- a/src/s/gnu-linux.h	Fri May 07 02:50:26 2010 +0200
+++ b/src/s/gnu-linux.h	Thu May 06 19:55:47 2010 -0700
@@ -1,7 +1,7 @@
 /* This file is the configuration file for Linux-based GNU systems
-   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -169,15 +169,6 @@
 /* Ask GCC where to find libgcc.a.  */
 #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
 
-/* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-   that says where to find X windows at run time.  */
-
-#ifdef __mips__
-#define LD_SWITCH_SYSTEM -G 0 $(LD_SWITCH_X_SITE_AUX)
-#else
-#define LD_SWITCH_SYSTEM $(LD_SWITCH_X_SITE_AUX)
-#endif /* __mips__ */
-
 #ifdef emacs
 #define INTERRUPT_INPUT
 #endif