Mercurial > emacs

changeset 30139:1311deba5ed3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(HAVE_XPM): Undo previous change. Check for preprocessor define XpmReturnAllocPixels.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 10 Jul 2000 20:37:48 +0000
parents d00767029418
children a567b99dd7d3
files configure.in
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Mon Jul 10 20:36:58 2000 +0000
+++ b/configure.in	Mon Jul 10 20:37:48 2000 +0000
@@ -1766,7 +1766,15 @@
     old_c_flags="${CFLAGS}"
     CFLAGS="${LD_SWITCH_X_SITE}"
     AC_CHECK_HEADER(X11/xpm.h,
-      AC_CHECK_LIB(Xpm, XpmReturnAllocPixels, HAVE_XPM=yes, , -lX11))
+      AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11))
+    if test "${HAVE_XPM}" = "yes"; then
+       AC_EGREP_CPP(no_return_alloc_pixels,
+       [#include "X11/xpm.h"
+#ifndef XpmReturnAllocPixels
+no_return_alloc_pixels
+#endif
+	], HAVE_XPM=no, HAVE_XPM=yes)
+    fi
     CFLAGS="${old_c_flags}"
   fi