[Emacs-diffs] emacs-24 r117216: Port better to AIX.

[Paul Eggert]

------------------------------------------------------------
revno: 117216
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17598
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-06-06 23:10:39 -0700
message:
  Port better to AIX.
  
  * configure.ac (with_xpm_set): New shell var.
  (_THREAD_SAFE): Define on AIX if HAVE_PTHREAD.
  (with_xpm): Default to 'no' on AIX.
  (LIBXPM): Append -lXpm if -lXaw is also used, as the latter
  requires the former on AIX.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-30 20:19:29 +0000
+++ b/ChangeLog 2014-06-07 06:10:39 +0000
@@ -1,3 +1,12 @@
+2014-06-07  Paul Eggert  <address@hidden>
+
+       Port better to AIX (Bug#17598).
+       * configure.ac (with_xpm_set): New shell var.
+       (_THREAD_SAFE): Define on AIX if HAVE_PTHREAD.
+       (with_xpm): Default to 'no' on AIX.
+       (LIBXPM): Append -lXpm if -lXaw is also used, as the latter
+       requires the former on AIX.
+
 2014-05-30  Paul Eggert  <address@hidden>
 
        Fix port to 32-bit AIX with xlc (Bug#17598).

=== modified file 'configure.ac'
--- a/configure.ac      2014-05-30 20:19:29 +0000
+++ b/configure.ac      2014-06-07 06:10:39 +0000
@@ -242,6 +242,7 @@
 
 dnl _ON results in a '--without' option in the --help output, so
 dnl the help text should refer to "don't compile", etc.
+with_xpm_set=${with_xpm+set}
 OPTION_DEFAULT_ON([xpm],[don't compile with XPM image support])
 OPTION_DEFAULT_ON([jpeg],[don't compile with JPEG image support])
 OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image support])
@@ -2074,6 +2075,14 @@
        LIBS="$LIB_PTHREAD $LIBS" ;;
   esac
   AC_DEFINE(HAVE_PTHREAD, 1, [Define to 1 if you have pthread (-lpthread).])
+
+  # Some systems optimize for single-threaded programs by default, and
+  # need special flags to disable these optimizations. For example, the
+  # definition of 'errno' in <errno.h>.
+  if test "$opsys" = aix4-2; then
+    AC_DEFINE([_THREAD_SAFE], [1],
+      [Define to 1 if your system requires this in multithreaded code.])
+  fi
 fi
 AC_SUBST([LIB_PTHREAD])
 
@@ -2984,6 +2993,9 @@
 fi
 
 if test "${HAVE_X11}" = "yes"; then
+  dnl Avoid Xpm on AIX unless requested, as it crashes; see Bug#17598.
+  test "$opsys$with_xpm_set" = aix4-2 && with_xpm=no
+
   if test "${with_xpm}" != "no"; then
     AC_CHECK_HEADER(X11/xpm.h,
       [AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)])
@@ -3007,6 +3019,9 @@
   if test "${HAVE_XPM}" = "yes"; then
     AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
     LIBXPM=-lXpm
+  elif test "$opsys,$LUCID_LIBW" = aix4-2,-lXaw; then
+    dnl AIX -lXaw needs -lXpm linked too; see Bug#17598 Message#152.
+    LIBXPM=-lXpm
   fi
 fi