summaryrefslogtreecommitdiff
path: root/src/s/aix4-2.h
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-03-22 19:39:19 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-03-22 19:39:19 -0700
commit5845f0ed5a260ad0708bb82dea89b38b01aa2d1b (patch)
tree47e822dabcc285a9f2c0ac31edf9b56b8b7e168c /src/s/aix4-2.h
parent002787475ff69f44a4fbd26bfe8b8dad3ea435ed (diff)
downloademacs-5845f0ed5a260ad0708bb82dea89b38b01aa2d1b.tar.gz
Simplify LIBS_MACHINE definitions.
* m/hp800.h (LIBS_MACHINE): Remove, same as default. * m/iris4d.h (LIBS_MACHINE): Likewise. * m/ibmrs6000.h (LIBS_MACHINE): Rename to LIBS_SYSTEM and move ... * s/aix4-2.h (LIBS_SYSTEM): ... here.
Diffstat (limited to 'src/s/aix4-2.h')
-rw-r--r--src/s/aix4-2.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index f4ffc606221..93869db6bca 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -95,6 +95,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define LIB_STANDARD
+/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
+ on older versions of X where it happens to exist. */
+#ifdef HAVE_LIBPTHREADS
+#define LIBS_SYSTEM -lrts -lIM -liconv -lpthreads
+#else
+/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2. */
+#define LIBS_SYSTEM -lrts -lIM -liconv
+#endif
+
/* Use terminfo instead of termcap. */
#define TERMINFO