Mercurial > hg > xemacs-beta
changeset 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 | e7561d9e90ee |
| children | 403b69a87321 |
| files | ChangeLog configure.ac lib-src/ChangeLog lib-src/installexe.sh |
| diffstat | 4 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Sep 18 21:51:11 2005 +0000 +++ b/ChangeLog Mon Sep 19 00:36:05 2005 +0000 @@ -1,3 +1,8 @@ +2005-09-18 Mike Alexander <mta@arbortext.com> + + * configure.ac: Fix the cygwin, non-X build by adding XPM header + and library files to XE_CFLAGS. Patch from Rick Rankin. + 2005-09-17 Malcolm Purvis <malcolmp@xemacs.org> * configure.in: Replace with warning to use autoconf 2.59.
--- a/configure.ac Sun Sep 18 21:51:11 2005 +0000 +++ b/configure.ac Mon Sep 19 00:36:05 2005 +0000 @@ -3755,6 +3755,7 @@ xpm_problem="" if test -z "$with_xpm"; then XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) XE_PREPEND("$libpath_xpm", LDFLAGS) AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm @@ -3794,6 +3795,7 @@ XE_PREPEND("$libpath_xpm", LDFLAGS) XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) AC_MSG_CHECKING(for \"FOR_MSW\" xpm) xe_check_libs=-lXpm AC_TRY_LINK(, [XpmCreatePixmapFromData()],
--- a/lib-src/ChangeLog Sun Sep 18 21:51:11 2005 +0000 +++ b/lib-src/ChangeLog Mon Sep 19 00:36:05 2005 +0000 @@ -1,3 +1,8 @@ +2005-09-18 Mike Alexander <mta@arbortext.com> + + * installexe.sh: Don't add an exe extention to a file that already + has one. Patch from Rick Rankin. + 2005-09-14 Stephen J. Turnbull <stephen@xemacs.org> * XEmacs 21.5.22 "cucumber" is released.
--- a/lib-src/installexe.sh Sun Sep 18 21:51:11 2005 +0000 +++ b/lib-src/installexe.sh Mon Sep 19 00:36:05 2005 +0000 @@ -5,11 +5,16 @@ tstr="" -while [ $# -gt 0 ] +while [[ $# -gt 0 ]] do - if [ -f $1.exe ] + if [[ -f $1.exe ]] then - tstr="$tstr$1.exe $2.exe" + if [[ "$2" == *.exe ]] + then + tstr="$tstr$1 $2" + else + tstr="$tstr$1.exe $2.exe" + fi shift 2 else tstr="$tstr$1 "