-#include "usg5-4.h"
-
-/* eggert@twinsun.com said these work in Solaris.
- Perhaps they work in all kinds of SVR4, but this is more conservative. */
-#undef BROKEN_TIOCGETC
-#undef BROKEN_TIOCGWINSZ
-
-/* This triggers a conditional in xfaces.c. */
-#define XOS_NEEDS_TIME_H
-
-#define POSIX
-
-/* Here is how to find X Windows. The -R option says where
- to find X windows at run time. */
-#ifndef __GNUC__
-#define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX
-#else /* GCC */
-#define LD_SWITCH_SYSTEM -Xlinker LD_SWITCH_X_SITE_AUX
-#endif /* GCC */
-
-/* Compile in non-ansi fashion to work around bugs in system header files. */
-#ifndef __GNUC__
-#define C_SWITCH_SYSTEM -Xs
-#else /* GCC */
-#define C_SWITCH_SYSTEM -traditional
-#endif /* GCC */
-#define const
-
-/* Karl Berry writes:
-If you have the misfortune to be running Solaris 2.1, you may have
-noticed that the access system call does not check the readonlyness of
-the filesystem the path refers to. This is a bug, according to
-access(2), but in the meantime, some of us need the right behavior. */
-
-/* Well, we released Emacs with this change, and fixed a typo, but
- people keep saying that it doesn't work, and that the patch is easy
- to install. Patch number is 100947-02. */
-#undef SOLARIS_BROKEN_ACCESS
+#include "usg5-4.h"
+
+#define SOLARIS2
+
+/* eggert@twinsun.com said these work in Solaris.
+ Perhaps they work in all kinds of SVR4, but this is more conservative. */
+#undef BROKEN_TIOCGETC
+#undef BROKEN_TIOCGWINSZ
+
+/* This triggers a conditional in xfaces.c. */
+#define XOS_NEEDS_TIME_H
+
+#define POSIX
+
+/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option
+ says where to find X windows at run time. */
+#ifndef __GNUC__
+#define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX
+#else /* GCC */
+/* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
+ has anything in it. It can be empty.
+ This works ok in src. Luckily lib-src does not use LD_SWITCH_SYSTEM. */
+#define LD_SWITCH_SYSTEM `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX`
+#endif /* GCC */
+
+#undef LIBS_SYSTEM
+#define LIBS_SYSTEM -lsocket -lnsl -lkstat
+
+/* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
+ ghazi@caip.rutgers.edu, 7/21/97. */
+#define HAVE_LIBKSTAT
+
+/* eggert thinks all versions of SunPro C allowed this. */
+#ifndef __GNUC__
+#define C_DEBUG_SWITCH -g -O
+#endif
+
+/* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style
+ XIM support. */
+
+#define INHIBIT_X11R6_XIM
+
+/* Must use the system's termcap, if we use any termcap.
+ It does special things. */
+
+#ifndef TERMINFO
+#define LIBS_TERMCAP -ltermcap
+#endif