-#include "s/sol2.h"
+/* casper@fwi.uva.nl says this file is not needed
+ and sol2.h should work. */
-/* Take care of libucb as well as X Windows. */
+#include "sol2.h"
+
+/* Take care of libucb.a as well as X Windows. */
#undef LD_SWITCH_SYSTEM
#ifndef __GNUC__
#define LD_SWITCH_SYSTEM -R/usr/openwin/lib:/usr/ucblib
#define LD_SWITCH_SYSTEM -Xlinker -R/usr/openwin/lib:/usr/ucblib
#endif /* GCC */
+/* Link with libucb.a. */
#ifdef LIB_STANDARD
#undef LIB_STANDARD
#define LIB_STANDARD -lc -L/usr/ucblib -lucb