Mercurial > emacs

comparison src/s/netbsd.h @ 108229:0c1c81ee223e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Glenn Morris <rgm@gnu.org>
date Mon, 03 May 2010 20:13:35 -0700
parents 13415f222ad9
children 06c34f190db1
comparison
equal deleted inserted replaced
108228:385494b60342 108229:0c1c81ee223e
41 #define END_FILES_1 41 #define END_FILES_1
42 #endif 42 #endif
43 43
44 #define AMPERSAND_FULL_NAME 44 #define AMPERSAND_FULL_NAME
45 45
46 /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option 46 /* LD_SWITCH_X_SITE_AUX_RPATH gives a -rpath option (which is what
47 says where to find X windows at run time. We convert it to a -rpath option 47 OSF1 uses) that says where to find X windows at run time. */
48 which is what OSF1 uses. */ 48 #define LD_SWITCH_SYSTEM $(LD_SWITCH_X_SITE_AUX_RPATH) -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib
49 #define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
50 #define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib
51 49
52 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears 50 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
53 the library search parth, i.e. it won't search /usr/lib 51 the library search parth, i.e. it won't search /usr/lib
54 for libc and friends. Using -nostartfiles instead avoids 52 for libc and friends. Using -nostartfiles instead avoids
55 this problem, and will also work on earlier NetBSD releases */ 53 this problem, and will also work on earlier NetBSD releases */