User: james Date: 06/03/30 18:23:12 Modified: xemacs ChangeLog configure.ac configure Log: Fix FOR_MSW detection with the XPM library. See xemacs-patches message <m31wwjkioq.fsf(a)jerrypc.cs.usu.edu&gt;. Revision Changes Path 1.496 +4 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.495 retrieving revision 1.496 diff -u -p -r1.495 -r1.496 --- ChangeLog 2006/03/28 15:55:48 1.495 +++ ChangeLog 2006/03/30 16:22:26 1.496 ＠＠ -1,3 +1,7 ＠＠ +2006-03-30 Jerry James <james(a)xemacs.org&gt; + + * configure.ac: Fix FOR_MSW XPM test, broken by previous update. + 2006-03-27 Jerry James <james(a)xemacs.org&gt; * aclocal.m4: Updates for autoconf 2.59. 1.39 +1 -1 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- configure.ac 2006/03/28 15:55:52 1.38 +++ configure.ac 2006/03/30 16:22:27 1.39 ＠＠ -4014,7 +4014,7 ＠＠ if test "$window_system" != "none"; then 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= 1.277 +13 -6 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.276 retrieving revision 1.277 diff -u -p -r1.276 -r1.277 --- configure 2006/03/28 15:55:49 1.276 +++ configure 2006/03/30 16:22:27 1.277 ＠＠ -16430,7 +16430,7 ＠＠ ac_x_header_dirs=' /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 ＠＠ _ACEOF 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 ＠＠ else 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 ＠＠ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } ＠＠ -23606,7 +23606,14 ＠＠ _ACEOF 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