[AC21.4] Patch for new xpm location on cygwin
APPROVE COMMIT 21.4
This patch was inspired by Rick Rankin's patch for 21.5.
The corresponding configure patch has been applied, too.
- Vin
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.241.2.89
diff -a -u -r1.241.2.89 ChangeLog
--- ChangeLog 2006/07/01 05:19:36 1.241.2.89
+++ ChangeLog 2006/12/08 03:27:12
＠＠ -1,3 +1,8 ＠＠
+2006-12-07 Vin Shelton <acs(a)xemacs.org>
+
+ * configure.in: Find relocated xpm library under cygwin.
+ Patch lifted from Rick Rankin's 21.5 version of the patch.
+
2006-05-17 Stephen J. Turnbull <stephen(a)xemacs.org>
* PROBLEMS: X11R7 loses x11/bitmaps/gray.
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Attic/configure.in,v
retrieving revision 1.151.2.37
diff -a -u -r1.151.2.37 configure.in
--- configure.in 2006/01/31 22:58:40 1.151.2.37
+++ configure.in 2006/12/08 03:27:14
＠＠ -3359,6 +3359,7 ＠＠
dnl -- should only happen if CYGWIN && WITH_XPM && WITH_MSW
&& !WITH_X
libpath_xpm=
incpath_xpm=
+ libname_xpm="-lXpm"
case "$opsys" in
cygwin*)
cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
＠＠ -3369,6 +3370,7 ＠＠
dnl hardcode "standard" non-X11 xpm lib/inc dirs
msw) libpath_xpm="-L${cygwin_top}/lib/noX"
incpath_xpm="-I${cygwin_top}/include/noX"
+ libname_xpm="-lXpm-noX"
;;
dnl not supported on cygwin (yet?)
gtk) ;;
＠＠ -3387,7 +3389,7 ＠＠
XE_PREPEND("$incpath_xpm", CFLAGS)
XE_PREPEND("$libpath_xpm", LDFLAGS)
AC_MSG_CHECKING(for Xpm - no older than 3.4f)
- xe_check_libs=-lXpm
+ xe_check_libs="$libname_xpm"
AC_TRY_RUN([#define XPM_NUMBERS
#include <X11/xpm.h>
int main(int c, char **v) {
＠＠ -3422,10 +3424,10 ＠＠
dnl #### but doesn't actually verify this assumption.
AC_DEFINE(HAVE_XPM)
XE_PREPEND("$libpath_xpm", LDFLAGS)
- XE_PREPEND(-lXpm, libs_x)
+ XE_PREPEND("$libname_xpm", libs_x)
XE_PREPEND("$incpath_xpm", CFLAGS)
AC_MSG_CHECKING(for \"FOR_MSW\" xpm)
- xe_check_libs=-lXpm
+ xe_check_libs="$libname_xpm"
AC_TRY_LINK(, [XpmCreatePixmapFromData()],
[xpm_for_msw=no],
[xpm_for_msw=yes])
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches