* s/sol2-3.h: Insert contents of s/sol2.h.

(LD_SWITCH_SYSTEM): Remove redundant definition.
* s/sol2.h: Remove, unused.

3 files changed, 37 insertions, 71 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 12854406221..51524b2d3a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/sol2-3.h: Insert contents of s/sol2.h.
+        (LD_SWITCH_SYSTEM): Remove redundant definition.
+        * s/sol2.h: Remove, unused.
+
 2008-07-20  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
         * nsterm.m (ns_get_color): Recognize HSB,AHSB be synonyms for
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index 3adad4bf11a..145a9197e19 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -18,15 +18,42 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "usg5-4.h"
 
-#include "sol2.h"
+#define SOLARIS2
 
-/* Override LD_SWITCH_SYSTEM: add  -L /usr/ccs/lib to the sol2.h value.  */
+/* This triggers a conditional in xfaces.c.  */
+#define XOS_NEEDS_TIME_H
 
-#undef LD_SWITCH_SYSTEM
+#define POSIX
+
+#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.  Don't redefine if already defined
+   (e.g., by config.h). */
+#ifndef HAVE_LIBKSTAT
+#define HAVE_LIBKSTAT
+#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
+
+#define USE_MMAP_FOR_BUFFERS 1
 
 #ifndef __GNUC__
 #define LD_SWITCH_SYSTEM -L /usr/ccs/lib LD_SWITCH_X_SITE_AUX
+/* eggert thinks all versions of SunPro C allowed this.  */
+#define C_DEBUG_SWITCH -g -O
 #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.
@@ -38,7 +65,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Info from fnf@cygnus.com suggests this is appropriate.  */
 #define POSIX_SIGNALS
 
-/* We don't need the definition from usg5-3.h with POSIX_SIGNALS.  */
+/* We don't need the definition from usg5-4.h with POSIX_SIGNALS.  */
 #undef sigsetmask
 
 /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
diff --git a/src/s/sol2.h b/src/s/sol2.h
deleted file mode 100644
index bd6e1c9bdba..00000000000
--- a/src/s/sol2.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Definitions file for GNU Emacs running on Solaris 2.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-     2008  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-#include "usg5-4.h"
-
-#define SOLARIS2
-
-/* 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
-/* eggert thinks all versions of SunPro C allowed this.  */
-#define C_DEBUG_SWITCH -g -O
-#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 */
-
-#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.  Don't redefine if already defined
-   (e.g., by config.h). */
-#ifndef HAVE_LIBKSTAT
-#define HAVE_LIBKSTAT
-#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
-
-#define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: b0640f78-5ad5-4093-97c3-5b3abbf5a2be
-   (do not change this comment) */