(LIBXMU): Don't bother testing CANNOT_DUMP.

[gnu-emacs] / src / s / sol2-4.h

diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h
index b4d9c68d028e831440d43d6f67474cc39734db01..0744ae7773d4c4000484a2269707ee0f77e95254 100644 (file)
--- a/src/s/sol2-4.h
+++ b/src/s/sol2-4.h
@@ -4,14 +4,26 @@
 
 #define SOLARIS2_4
 
-/* Solaris 2.4 has a broken vfork.  And a header file has a declaration 
-   that conflicts with the definition of vfork in sysdep.c.
-   This definition should avoid it.  */
-#define vfork emacs_vfork
-
 /* Get rid of -traditional and let const really do its thing.  */
 
 #ifdef __GNUC__
 #undef C_SWITCH_SYSTEM
 #undef const
 #endif /* __GNUC__ */
+
+#undef LD_SWITCH_SYSTEM
+
+#ifndef __GNUC__
+#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX -R/usr/dt/lib -L/usr/dt/lib
+#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 temacs.  */
+#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
+ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` -R/usr/dt/lib -L/usr/dt/lib
+#endif /* GCC */
+
+/* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files
+   are in this directory on Solaris 2.4.  */
+#define C_SWITCH_X_SYSTEM -I/usr/dt/include
+