Mercurial > hg > xemacs-beta

changeset 3316:d45de99b5d79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-03-30 16:22:26 by james] Fix FOR_MSW detection with the XPM library. See xemacs-patches message <m31wwjkioq.fsf@jerrypc.cs.usu.edu>.
author james
date Thu, 30 Mar 2006 16:22:27 +0000
parents 90856eac4a56
children 83ea3a38afe7
files ChangeLog configure configure.ac
diffstat 3 files changed, 21 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 29 21:51:10 2006 +0000
+++ b/ChangeLog	Thu Mar 30 16:22:27 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-30  Jerry James  <james@xemacs.org>
+
+	* configure.ac: Fix FOR_MSW XPM test, broken by previous update.
+
 2006-03-27  Jerry James  <james@xemacs.org>
 
 	* aclocal.m4: Updates for autoconf 2.59.
--- a/configure	Wed Mar 29 21:51:10 2006 +0000
+++ b/configure	Thu Mar 30 16:22:27 2006 +0000
@@ -16430,7 +16430,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16438,7 +16438,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -16465,7 +16465,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -16486,11 +16486,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
-int
-main ()
-{
-XtMalloc (0)
+#include <X11/Xlib.h>
+int
+main ()
+{
+XrmInitialize ()
   ;
   return 0;
 }
@@ -23606,7 +23606,14 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-XpmCreatePixmapFromData()
+
+int
+main ()
+{
+XpmCreatePixmapFromData();
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--- a/configure.ac	Wed Mar 29 21:51:10 2006 +0000
+++ b/configure.ac	Thu Mar 30 16:22:27 2006 +0000
@@ -4014,7 +4014,7 @@
     XE_PREPEND("$incpath_xpm", XE_CFLAGS)
     AC_MSG_CHECKING([for "FOR_MSW" xpm])
     xe_check_libs=-lXpm
-    AC_LINK_IFELSE([AC_LANG_SOURCE([XpmCreatePixmapFromData()])],
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[XpmCreatePixmapFromData();])],
     [xpm_for_msw=no],
     [xpm_for_msw=yes])
     xe_check_libs=