Add #if 0 around everything but the include of sol2-4.h.

src/s/sol2-5.h

@@ -2,6 +2,7 @@
 
 #include "sol2-4.h"
 
+#if 0 /* A recent patch in unexelf.c should eliminate the need for this.  */
 /* Don't use the shared libraries for -lXt and -lXaw,
    to work around a linker bug in Solaris 2.5.
    (This also affects the other libraries used specifically for
@@ -15,3 +16,5 @@
 #define STATIC_OPTION -Bstatic
 #define DYNAMIC_OPTION -Bdynamic
 #endif
+
+#endif /* 0 */