diff options
| author | Richard M. Stallman | 1994-05-28 10:40:28 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-05-28 10:40:28 +0000 |
| commit | 88ae6b1aad38f2388e49eebc51b437264c96b499 (patch) | |
| tree | 9b5baa0dcc165aeaadc2a936a7fa590cb0b6efe2 /src | |
| parent | d2e75974f7c523b17df36c6f8f3c2fb652717a14 (diff) | |
| download | emacs-88ae6b1aad38f2388e49eebc51b437264c96b499.tar.gz emacs-88ae6b1aad38f2388e49eebc51b437264c96b499.zip | |
(LD_SWITCH_SYSTEM): Delete the -L options.
(LD_SWITCH_X_DEFAULT): Put them here instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/s/hpux8.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/s/hpux8.h b/src/s/hpux8.h index f2883bd21e2..86a04f77aea 100644 --- a/src/s/hpux8.h +++ b/src/s/hpux8.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11 | 14 | #define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11 |
| 15 | #define C_SWITCH_X_SYSTEM -I/usr/include/X11R5 -I/usr/include/X11R4 | 15 | #define C_SWITCH_X_SYSTEM -I/usr/include/X11R5 -I/usr/include/X11R4 |
| 16 | #define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R5 -L/usr/lib/X11R4 | ||
| 16 | 17 | ||
| 17 | /* Don't use shared libraries. unexec doesn't handle them. | 18 | /* Don't use shared libraries. unexec doesn't handle them. |
| 18 | Note GCC automatically passes -a archive to ld, and it has its own | 19 | Note GCC automatically passes -a archive to ld, and it has its own |
| @@ -22,23 +23,23 @@ | |||
| 22 | #define ORDINARY_LINK | 23 | #define ORDINARY_LINK |
| 23 | 24 | ||
| 24 | #ifdef HPUX_USE_SHLIBS | 25 | #ifdef HPUX_USE_SHLIBS |
| 25 | #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 26 | #define LD_SWITCH_SYSTEM |
| 26 | #else | 27 | #else |
| 27 | #define LD_SWITCH_SYSTEM -Xlinker -a -Xlinker archive -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 28 | #define LD_SWITCH_SYSTEM -Xlinker -a -Xlinker archive |
| 28 | #endif | 29 | #endif |
| 29 | 30 | ||
| 30 | #else /* not __GNUC__ */ | 31 | #else /* not __GNUC__ */ |
| 31 | #if (defined(hp9000s700) || defined(__hp9000s700)) | 32 | #if (defined(hp9000s700) || defined(__hp9000s700)) |
| 32 | #ifdef HPUX_USE_SHLIBS | 33 | #ifdef HPUX_USE_SHLIBS |
| 33 | #define LD_SWITCH_SYSTEM -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 34 | #define LD_SWITCH_SYSTEM -L/lib/pa1.1 |
| 34 | #else | 35 | #else |
| 35 | #define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 36 | #define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1 |
| 36 | #endif | 37 | #endif |
| 37 | #else /* not (defined(hp9000s700) || defined(__hp9000s700)) */ | 38 | #else /* not (defined(hp9000s700) || defined(__hp9000s700)) */ |
| 38 | #ifdef HPUX_USE_SHLIBS | 39 | #ifdef HPUX_USE_SHLIBS |
| 39 | #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 40 | #define LD_SWITCH_SYSTEM |
| 40 | #else | 41 | #else |
| 41 | #define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 42 | #define LD_SWITCH_SYSTEM -a archive |
| 42 | #endif | 43 | #endif |
| 43 | #endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */ | 44 | #endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */ |
| 44 | #endif /* not __GNUC__ */ | 45 | #endif /* not __GNUC__ */ |