#include "sol2-4.h"
-#undef GETTIMEOFDAY_ONE_ARGUMENT
+/* -lgen is needed for the regex and regcmp functions
+ which are used by Motif. In the future we can try changing
+ regex.c to provide them in Emacs, but this is safer for now. */
+#define LIB_MOTIF -lXm -lgen
+
+/* This is the only known way to avoid some crashes
+ that seem to relate to screwed up malloc data
+ after deleting a frame. */
+#define SYSTEM_MALLOC
+
+#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
+ the X toolkit, which may not be necessary.) */
+#define LIBXT_STATIC
+
+#ifdef __GNUC__
+#define STATIC_OPTION -Xlinker -Bstatic
+#define DYNAMIC_OPTION -Xlinker -Bdynamic
+#else
+#define STATIC_OPTION -Bstatic
+#define DYNAMIC_OPTION -Bdynamic
+#endif
+
+#endif /* 0 */