From 9d0ebf980bcb2966985c213ef8c80b5b1729f6ba Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 28 Aug 1998 23:38:20 +0000 Subject: [PATCH] (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. --- src/s/sol2-4.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h index 0744ae7773d..ad4fb0c5fd6 100644 --- a/src/s/sol2-4.h +++ b/src/s/sol2-4.h @@ -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 -- 2.39.2