Mercurial > hg > xemacs-beta
comparison configure.ac @ 2940:3ee1c468b215
[xemacs-hg @ 2005-09-19 00:36:01 by mta]
* configure.ac: Fix the cygwin, non-X build by adding XPM header and
library files to XE_CFLAGS. Patch from Rick Rankin.
* lib-src/installexe.sh: Don't add an exe extention to a file that already
has one. Patch from Rick Rankin.
author | mta |
---|---|
date | Mon, 19 Sep 2005 00:36:05 +0000 |
parents | ff857b8541b7 |
children | 414a64af46c9 |
comparison
equal
deleted
inserted
replaced
2939:e7561d9e90ee | 2940:3ee1c468b215 |
---|---|
3753 esac | 3753 esac |
3754 dnl Autodetect Xpm | 3754 dnl Autodetect Xpm |
3755 xpm_problem="" | 3755 xpm_problem="" |
3756 if test -z "$with_xpm"; then | 3756 if test -z "$with_xpm"; then |
3757 XE_PREPEND("$incpath_xpm", CFLAGS) | 3757 XE_PREPEND("$incpath_xpm", CFLAGS) |
3758 XE_PREPEND("$incpath_xpm", XE_CFLAGS) | |
3758 XE_PREPEND("$libpath_xpm", LDFLAGS) | 3759 XE_PREPEND("$libpath_xpm", LDFLAGS) |
3759 AC_MSG_CHECKING(for Xpm - no older than 3.4f) | 3760 AC_MSG_CHECKING(for Xpm - no older than 3.4f) |
3760 xe_check_libs=-lXpm | 3761 xe_check_libs=-lXpm |
3761 AC_RUN_IFELSE([AC_LANG_SOURCE([#define XPM_NUMBERS | 3762 AC_RUN_IFELSE([AC_LANG_SOURCE([#define XPM_NUMBERS |
3762 #include <X11/xpm.h> | 3763 #include <X11/xpm.h> |
3792 dnl #### but doesn't actually verify this assumption. | 3793 dnl #### but doesn't actually verify this assumption. |
3793 AC_DEFINE(HAVE_XPM) | 3794 AC_DEFINE(HAVE_XPM) |
3794 XE_PREPEND("$libpath_xpm", LDFLAGS) | 3795 XE_PREPEND("$libpath_xpm", LDFLAGS) |
3795 XE_PREPEND(-lXpm, libs_x) | 3796 XE_PREPEND(-lXpm, libs_x) |
3796 XE_PREPEND("$incpath_xpm", CFLAGS) | 3797 XE_PREPEND("$incpath_xpm", CFLAGS) |
3798 XE_PREPEND("$incpath_xpm", XE_CFLAGS) | |
3797 AC_MSG_CHECKING(for \"FOR_MSW\" xpm) | 3799 AC_MSG_CHECKING(for \"FOR_MSW\" xpm) |
3798 xe_check_libs=-lXpm | 3800 xe_check_libs=-lXpm |
3799 AC_TRY_LINK(, [XpmCreatePixmapFromData()], | 3801 AC_TRY_LINK(, [XpmCreatePixmapFromData()], |
3800 [xpm_for_msw=no], | 3802 [xpm_for_msw=no], |
3801 [xpm_for_msw=yes]) | 3803 [xpm_for_msw=yes]) |