From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 10 Jul 2000 20:37:48 +0000 (+0000)
Subject: (HAVE_XPM): Undo previous change.  Check for
X-Git-Tag: emacs-pretest-21.0.90~2893
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7960d0bd651978e49f598bff9575fa38ec175477;p=emacs.git

(HAVE_XPM): Undo previous change.  Check for
preprocessor define XpmReturnAllocPixels.
---

diff --git a/configure.in b/configure.in
index 87a353ba0b9..f91c3da4270 100644
--- a/configure.in
+++ b/configure.in
@@ -1766,7 +1766,15 @@ if test "${HAVE_X11}" = "yes"; then
     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