--- hpux11.h.~1~	Wed Oct 31 12:32:45 2001
+++ hpux11.h	Fri Nov  8 17:10:48 2002
@@ -6,3 +6,30 @@
 #undef POSIX_SIGNALS
 #endif
 #define POSIX_SIGNALS 1
+
+#ifdef C_SWITCH_SYSTEM
+#undef C_SWITCH_SYSTEM
+#endif
+
+/* HPUX 11 inherits all the quirkiness of the older version as far as where it
+   installs various libraries and headers, plus it adds some new twists.
+   libXmu is in /usr/contrib, libXaw3d (if installed, it is optional) is in
+   /usr/local, and Motif is in it's own tree outside the X11 tree (as
+   before). */
+
+#undef C_SWITCH_X_SYSTEM
+#define C_SWITCH_X_SYSTEM -I/usr/local/include -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -I/usr/include/Motif2.1
+
+#undef LD_SWITCH_X_DEFAULT
+#define LD_SWITCH_X_DEFAULT -L/usr/local/lib/X11 -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -L/usr/lib/Motif2.1
+
+#undef  LD_SWITCH_SYSTEM
+#define LD_SWITCH_SYSTEM LD_SWITCH_X_DEFAULT
+
+#ifndef __GNUC__
+/* Make room for enough symbols, so dispnew.c does not fail.  */
+#define C_SWITCH_SYSTEM -Ae -Wp,-H200000 -D_HPUX_SOURCE C_SWITCH_X_SYSTEM LD_SWITCH_X_DEFAULT
+#else
+#define C_SWITCH_SYSTEM C_SWITCH_X_SYSTEM LD_SWITCH_X_DEFAULT
+#endif
+