# HG changeset patch # User Paul Eggert # Date 904347500 0 # Node ID bdfd64faa90ad17e01c50db94e85a2ec751e3ff0 # Parent 14e74d2a49cbfba56072312ad2e2a940a653efc0 (NOT_USING_MOTIF): New macro. (LD_SWITCH_SYSTEM_TEMACS): Put /usr/dt/lib in the link library path only if we're not building with Motif. diff -r 14e74d2a49cb -r bdfd64faa90a src/s/sol2-4.h --- a/src/s/sol2-4.h Fri Aug 28 12:33:52 1998 +0000 +++ b/src/s/sol2-4.h Fri Aug 28 23:38:20 1998 +0000 @@ -13,14 +13,20 @@ #undef LD_SWITCH_SYSTEM +/* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet. + Instead, dynamically check whether USE_MOTIF expands to something. */ +#define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; } + #ifndef __GNUC__ -#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX -R/usr/dt/lib -L/usr/dt/lib +#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \ + `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'` #else /* GCC */ /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX has anything in it. It can be empty. This works ok in temacs. */ #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \ - `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` -R/usr/dt/lib -L/usr/dt/lib + `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \ + `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'` #endif /* GCC */ /* Gregory Neil Shapiro reports the Motif header files