CVS update by mta xemacs/lib-src ...
User: mta
Date: 05/09/19 02:36:06
Modified: xemacs/lib-src ChangeLog installexe.sh
Log:
* 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.
Revision Changes Path
1.459 +5 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- ChangeLog 2005/09/18 13:01:03 1.458
+++ ChangeLog 2005/09/19 00:36:01 1.459
＠＠ -1,3 +1,8 ＠＠
+2005-09-18 Mike Alexander <mta(a)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(a)xemacs.org>
* configure.in: Replace with warning to use autoconf 2.59.
1.13 +2 -0 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- configure.ac 2005/09/18 13:01:08 1.12
+++ configure.ac 2005/09/19 00:36:02 1.13
＠＠ -3755,6 +3755,7 ＠＠ if test "$window_system" != "none"; then
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 ＠＠ if test "$window_system" != "none"; then
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()],
1.195 +5 -0 XEmacs/xemacs/lib-src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- ChangeLog 2005/09/14 05:29:26 1.194
+++ ChangeLog 2005/09/19 00:36:05 1.195
＠＠ -1,3 +1,8 ＠＠
+2005-09-18 Mike Alexander <mta(a)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(a)xemacs.org>
* XEmacs 21.5.22 "cucumber" is released.
1.5 +8 -3 XEmacs/xemacs/lib-src/installexe.sh
Index: installexe.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/installexe.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- installexe.sh 2001/04/12 18:21:02 1.4
+++ installexe.sh 2005/09/19 00:36:05 1.5
＠＠ -5,11 +5,16 ＠＠ shift
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 "