* textprop.c (text_property_stickiness): doc fix.

[gnu-emacs] / src / s / hpux8.h

diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index f2883bd21e24eb0eeb180f17cf9a44ba841cd4ff..e73c630e825b489c583cd003f368e261800e6bdb 100644 (file)
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -4,15 +4,16 @@
    Our conjecture that they are needed for hpux version 8,
    which is what runs on the 700.  */
 
-#include "hpux.h"
-
 #define HPUX8
 
+#include "hpux.h"
+
 /* dob@inel.gov says HPUX 8.07 needs this.  He was using X11R5, I think.  */
 #define LIBX11_SYSTEM -lXext
 
 #define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11
 #define C_SWITCH_X_SYSTEM -I/usr/include/X11R5 -I/usr/include/X11R4
+#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R5 -L/usr/lib/X11R4
 
 /* Don't use shared libraries.  unexec doesn't handle them.
    Note GCC automatically passes -a archive to ld, and it has its own
@@ -22,23 +23,27 @@
 #define ORDINARY_LINK
 
 #ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM_TEMACS
 #else
-#define LD_SWITCH_SYSTEM -Xlinker -a -Xlinker archive -L/usr/lib/X11R5 -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM_TEMACS -Xlinker -a -Xlinker archive
 #endif
 
 #else /* not __GNUC__ */
+/* Note, -a only works for hpux ld, not cc.  And "cc LD_SWITCH_SYSTEM"
+   is used in configure's $ac_link to do various autoconf checks.
+   Since we only need -a when unexec'ing, only pass in -a to
+   "ld temacs" (ghazi@caip.rutgers.edu  7/10/97).  */
 #if (defined(hp9000s700) || defined(__hp9000s700))
 #ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM_TEMACS -L/lib/pa1.1
 #else
-#define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM_TEMACS -a archive -L/lib/pa1.1
 #endif
 #else /* not (defined(hp9000s700) || defined(__hp9000s700)) */
 #ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM_TEMACS
 #else
-#define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM_TEMACS -a archive
 #endif
 #endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */
 #endif /* not __GNUC__ */
@@ -47,7 +52,7 @@
    and none have sioctl.h, so might as well define this.  */
 #define NO_SIOCTL_H
 
-#if 0 /* autoconf should be detecting the presence or absence of 
+#if 0 /* autoconf should be detecting the presence or absence of
         random and srandom now.  */
 /* If you use X11R4 you must define this.  If you use
    X11R5 you must comment this out */
@@ -64,3 +69,6 @@
 
 /* Enable a special hack in XTread_socket.  */
 #define X_IO_BUG
+
+/* arch-tag: 25fafe5c-b26c-43ab-8144-1629d59207ee
+   (do not change this comment) */