1 files changed, 5 insertions, 5 deletions
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index e49dcd6800c..5e024722c07 100644
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -8,23 +8,23 @@
 #define HPUX8
-#define LIB_X11_LIB -L/usr/lib/X11R4 -lX11
+#define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11
-#define C_SWITCH_SYSTEM -I/usr/include/X11R4
+#define C_SWITCH_SYSTEM -I/usr/lib/X11R5 -I/usr/include/X11R4
 /* Don't use shared libraries.  unexec doesn't handle them.
   Note GCC automatically passes -a archive to ld, and it has its own
   conflicting -a.  */
 #ifdef __GNUC__
-#define LD_SWITCH_SYSTEM  -L/usr/lib/X11R4 -Xlinker -a -Xlinker archive
+#define LD_SWITCH_SYSTEM  -L/usr/lib/X11R5 -L/usr/lib/X11R4 -Xlinker -a -Xlinker archive
 /* No need to specify roundabout way of linking temacs.  */
 #define ORDINARY_LINK
 #else
-#define LD_SWITCH_SYSTEM -a archive  -L/usr/lib/X11R4
+#define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4
 #endif
 /* Specify compiler options for compiling oldXMenu.  */
-#define OLDXMENU_OPTIONS CFLAGS=-I/usr/include/X11R4
+#define OLDXMENU_OPTIONS CFLAGS=-I/usr/include/X11R5 -I/usr/include/X11R4
 /* Some hpux 8 machines seem to have TIOCGWINSZ,
   and none have sioctl.h, so might as well define this.  */

diff --git a/src/s/hpux8.h b/src/s/hpux8.h index e49dcd6800c..5e024722c07 100644 --- a/src/s/hpux8.h +++ b/src/s/hpux8.h
@@ -8,23 +8,23 @@
8		8
9	#define HPUX8	9	#define HPUX8
10		10
11	#define LIB_X11_LIB -L/usr/lib/X11R4 -lX11	11	#define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11
12	#define C_SWITCH_SYSTEM -I/usr/include/X11R4	12	#define C_SWITCH_SYSTEM -I/usr/lib/X11R5 -I/usr/include/X11R4
13		13
14	/* Don't use shared libraries. unexec doesn't handle them.	14	/* Don't use shared libraries. unexec doesn't handle them.
15	Note GCC automatically passes -a archive to ld, and it has its own	15	Note GCC automatically passes -a archive to ld, and it has its own
16	conflicting -a. */	16	conflicting -a. */
17	#ifdef __GNUC__	17	#ifdef __GNUC__
18	#define LD_SWITCH_SYSTEM -L/usr/lib/X11R4 -Xlinker -a -Xlinker archive	18	#define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4 -Xlinker -a -Xlinker archive
19		19
20	/* No need to specify roundabout way of linking temacs. */	20	/* No need to specify roundabout way of linking temacs. */
21	#define ORDINARY_LINK	21	#define ORDINARY_LINK
22	#else	22	#else
23	#define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R4	23	#define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4
24	#endif	24	#endif
25		25
26	/* Specify compiler options for compiling oldXMenu. */	26	/* Specify compiler options for compiling oldXMenu. */
27	#define OLDXMENU_OPTIONS CFLAGS=-I/usr/include/X11R4	27	#define OLDXMENU_OPTIONS CFLAGS=-I/usr/include/X11R5 -I/usr/include/X11R4
28		28
29	/* Some hpux 8 machines seem to have TIOCGWINSZ,	29	/* Some hpux 8 machines seem to have TIOCGWINSZ,
30	and none have sioctl.h, so might as well define this. */	30	and none have sioctl.h, so might as well define this. */