1 Index: lyx-devel/config/progtest.m4
2 ===================================================================
3 RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/progtest.m4,v
4 retrieving revision 1.2
5 diff -u -r1.2 progtest.m4
6 --- lyx-devel/config/progtest.m4 2000/01/08 21:02:55 1.2
7 +++ lyx-devel/config/progtest.m4 2001/01/01 01:09:00
9 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
10 dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
11 AC_DEFUN(AM_PATH_PROG_WITH_TEST,
12 +[case "`uname -s 2> /dev/null`" in
14 + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
25 [# Extract the first word of "$2", so it can be a program name with args.
26 set dummy $2; ac_word=[$]2
27 AC_MSG_CHECKING([for $ac_word])
29 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
32 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
33 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
34 for ac_dir in ifelse([$5], , $PATH, [$5]); do
35 test -z "$ac_dir" && ac_dir=.
36 - if test -f $ac_dir/$ac_word; then
37 + if test -f $ac_dir/$ac_word \
38 + -o -f $ac_dir/$ac_word$EXE_EXT \
39 + -o -f $ac_dir/$ac_word$CMD_EXT; then
41 ac_cv_path_$1="$ac_dir/$ac_word"
43 Index: lyx-devel/lib/configure.m4
44 ===================================================================
45 RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
46 retrieving revision 1.17
47 diff -u -r1.17 configure.m4
48 --- lyx-devel/lib/configure.m4 2000/11/21 15:45:42 1.17
49 +++ lyx-devel/lib/configure.m4 2001/01/01 01:09:05
52 define(SEARCH_PROG,[dnl
54 +case "`uname -s 2> /dev/null`" in
56 + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
71 set dummy $ac_prog ; ac_word=$[2]
72 if test -n "$ac_word"; then
73 MSG_CHECKING([for \"$ac_word\"],[+])
74 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
75 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS"
76 for ac_dir in $PATH; do
77 test -z "$ac_dir" && ac_dir=.
78 - if test -x [$ac_dir/$ac_word]; then
79 + if test -x [$ac_dir/$ac_word] \
80 + -o -x [$ac_dir/$ac_word$EXE_EXT] \
81 + -o -x [$ac_dir/$ac_word$CMD_EXT]; then
88 # Search for an installed reLyX or a ready-to-install one
89 +case "`uname -s 2> /dev/null`" in
91 +save_PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
96 -PATH=${PATH}:./reLyX/
100 +PATH=${PATH}${PATH_IFS}./reLyX/
101 SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX)
103 test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i"
104 Index: lyx-devel/lib/reLyX/acinclude.m4
105 ===================================================================
106 RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/acinclude.m4,v
107 retrieving revision 1.2
108 diff -u -r1.2 acinclude.m4
109 --- lyx-devel/lib/reLyX/acinclude.m4 2000/11/07 12:07:13 1.2
110 +++ lyx-devel/lib/reLyX/acinclude.m4 2001/01/01 01:09:06
112 dnl RELYX_SEARCH_PROG(VARIABLE-NAME,PROGRAMS-LIST,ACTION-IF-FOUND)
114 define(RELYX_SEARCH_PROG,[dnl
115 +case "`uname -s 2> /dev/null`" in
117 + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
124 for ac_prog in $2 ; do
125 # Extract the first word of "$ac_prog", so it can be a program name with
127 set dummy $ac_prog ; ac_word=$[2]
128 if test ! -n "[$]$1"; then
129 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
130 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
131 for ac_dir in $PATH; do
132 test -z "$ac_dir" && ac_dir=.
133 - if test -f [$ac_dir/$ac_word]; then
134 + if test -f [$ac_dir/$ac_word] -o -f [$ac_dir/$ac_word$ac_exeext]; then
138 Index: lyx-devel/lib/reLyX/configure.in
139 ===================================================================
140 RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/configure.in,v
141 retrieving revision 1.8
142 diff -u -r1.8 configure.in
143 --- lyx-devel/lib/reLyX/configure.in 2000/06/26 15:33:12 1.8
144 +++ lyx-devel/lib/reLyX/configure.in 2001/01/01 01:09:06
147 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
148 AC_CONFIG_AUX_DIR(../../config)
152 dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
153 Index: lyx-devel/src/os2_defines.h
154 ===================================================================
155 RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/os2_defines.h,v
156 retrieving revision 1.5
157 diff -u -r1.5 os2_defines.h
158 --- lyx-devel/src/os2_defines.h 2000/11/08 09:39:44 1.5
159 +++ lyx-devel/src/os2_defines.h 2001/01/01 01:09:07
161 #ifndef OS2_DEFINES_H
162 #define OS2_DEFINES_H
164 +#if defined (__cplusplus)
166 -#include <process.h>
168 +extern "C" inline int readlink(const char *, char *, size_t) {return -1;}
172 +#define readlink(s, t, l) (-1)
174 +#include <process.h>
176 #include <X11/Xlocale.h>
177 /* #include <malloc.h> */
179 #define S_ISLNK(x) false
180 #define S_ISBLK(x) false
181 -#define readlink(s, t, l) (strcpy(t, s), strlen(t))
182 /*#define mkfifo(p, m) (0) *//* LyXserver is temporary disabled. */
183 #define chdir _chdir2
184 #define strcasecmp stricmp
185 Index: lyx-devel/src/support/rename.C
186 ===================================================================
187 RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/rename.C,v
188 retrieving revision 1.5
189 diff -u -r1.5 rename.C
190 --- lyx-devel/src/support/rename.C 2000/11/13 10:35:02 1.5
191 +++ lyx-devel/src/support/rename.C 2001/01/01 01:09:10
194 bool lyx::rename(string const & from, string const & to)
197 + ::unlink(to.c_str());
199 if (::rename(from.c_str(), to.c_str()) == -1)
200 if (lyx::copy(from, to)) {
202 Index: lyx-devel/src/support/syscall.C
203 ===================================================================
204 RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/syscall.C,v
205 retrieving revision 1.18
206 diff -u -r1.18 syscall.C
207 --- lyx-devel/src/support/syscall.C 2000/10/11 21:06:43 1.18
208 +++ lyx-devel/src/support/syscall.C 2001/01/01 01:09:10
210 #include "syscontr.h"
211 #include "support/lstrings.h"
212 #include "support/lyxlib.h"
213 +#include "support/filetools.h"
217 Index: lyx-devel/src/support/tempname.C
218 ===================================================================
219 RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/tempname.C,v
220 retrieving revision 1.4
221 diff -u -r1.4 tempname.C
222 --- lyx-devel/src/support/tempname.C 2000/11/15 03:22:08 1.4
223 +++ lyx-devel/src/support/tempname.C 2001/01/01 01:09:10
226 extern string system_tempdir;
229 + // EMX mkstemp() behaviour may be problematic, however,
230 + // as noted by Lgb in the comment to CreateTmpDir(),
231 + // there is no point for using mkstemp() here.
233 +#include <sys/types.h>
234 +#include <sys/stat.h>
235 +#define INCL_DOSFILEMGR
240 int make_tempfile(char * templ)
243 return ::mkstemp(templ);
249 + DosSetRelMaxFH(&req, &cur); // No need to check error code.
251 // This probably just barely works...
253 - return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
254 + return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);