-diff -ubr -X g:/exclude lyx-devel/config/progtest.m4 lyx-build/config/progtest.m4
---- lyx-devel/config/progtest.m4 Tue Feb 22 06:44:28 2000
-+++ lyx-build/config/progtest.m4 Wed May 10 10:12:44 2000
+Index: lyx-devel/config/progtest.m4
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/progtest.m4,v
+retrieving revision 1.2
+diff -u -r1.2 progtest.m4
+--- lyx-devel/config/progtest.m4 2000/01/08 21:02:55 1.2
++++ lyx-devel/config/progtest.m4 2001/01/01 01:09:00
@@ -11,6 +11,19 @@
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
if [$3]; then
ac_cv_path_$1="$ac_dir/$ac_word"
break
-diff -ubr -X g:/exclude lyx-devel/lib/configure.m4 lyx-build/lib/configure.m4
---- lyx-devel/lib/configure.m4 Tue Feb 22 06:44:42 2000
-+++ lyx-build/lib/configure.m4 Wed May 10 07:24:02 2000
+Index: lyx-devel/lib/configure.m4
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
+retrieving revision 1.17
+diff -u -r1.17 configure.m4
+--- lyx-devel/lib/configure.m4 2000/11/21 15:45:42 1.17
++++ lyx-devel/lib/configure.m4 2001/01/01 01:09:05
@@ -28,6 +28,19 @@
dnl
define(SEARCH_PROG,[dnl
test -z "$ac_dir" && ac_dir=.
- if test -x [$ac_dir/$ac_word]; then
+ if test -x [$ac_dir/$ac_word] \
-+ -o -x [$ac_dir/$ac_word$EXE_EXT] \
-+ -o -x [$ac_dir/$ac_word$CMD_EXT]; then
++ -o -x [$ac_dir/$ac_word$EXE_EXT] \
++ -o -x [$ac_dir/$ac_word$CMD_EXT]; then
$2="$ac_prog"
break
fi
-@@ -179,8 +194,17 @@
+@@ -180,8 +195,17 @@
fi
# Search for an installed reLyX or a ready-to-install one
+;;
+esac
+PATH=${PATH}${PATH_IFS}./reLyX/
- SEARCH_PROG([for reLyX LaTeX-to-LyX translator],RELYX,reLyX)
+ SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX)
PATH=${save_PATH}
-
-diff -ubr -X g:/exclude lyx-devel/lib/reLyX/acinclude.m4 lyx-build/lib/reLyX/acinclude.m4
---- lyx-devel/lib/reLyX/acinclude.m4 Tue Sep 28 03:44:34 1999
-+++ lyx-build/lib/reLyX/acinclude.m4 Wed May 10 05:38:36 2000
-@@ -11,15 +11,24 @@
+ test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i"
+Index: lyx-devel/lib/reLyX/acinclude.m4
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/acinclude.m4,v
+retrieving revision 1.2
+diff -u -r1.2 acinclude.m4
+--- lyx-devel/lib/reLyX/acinclude.m4 2000/11/07 12:07:13 1.2
++++ lyx-devel/lib/reLyX/acinclude.m4 2001/01/01 01:09:06
+@@ -10,15 +10,24 @@
dnl RELYX_SEARCH_PROG(VARIABLE-NAME,PROGRAMS-LIST,ACTION-IF-FOUND)
dnl
define(RELYX_SEARCH_PROG,[dnl
$1="$ac_prog"
break
fi
-diff -ubr -X g:/exclude lyx-devel/lib/reLyX/configure.in lyx-build/lib/reLyX/configure.in
---- lyx-devel/lib/reLyX/configure.in Tue Feb 22 06:45:24 2000
-+++ lyx-build/lib/reLyX/configure.in Wed May 10 05:38:34 2000
+Index: lyx-devel/lib/reLyX/configure.in
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/configure.in,v
+retrieving revision 1.8
+diff -u -r1.8 configure.in
+--- lyx-devel/lib/reLyX/configure.in 2000/06/26 15:33:12 1.8
++++ lyx-devel/lib/reLyX/configure.in 2001/01/01 01:09:06
@@ -2,6 +2,7 @@
AC_INIT(reLyX.in)
AC_PREREQ(2.13) dnl We want to use autoconf 2.13
dnl PACKAGE=reLyX
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
-diff -ubr -X g:/exclude lyx-devel/src/os2_defines.h lyx-build/src/os2_defines.h
---- lyx-devel/src/os2_defines.h Fri Mar 10 06:25:50 2000
-+++ lyx-build/src/os2_defines.h Fri May 5 11:37:48 2000
-@@ -13,9 +13,14 @@
+Index: lyx-devel/src/os2_defines.h
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/os2_defines.h,v
+retrieving revision 1.5
+diff -u -r1.5 os2_defines.h
+--- lyx-devel/src/os2_defines.h 2000/11/08 09:39:44 1.5
++++ lyx-devel/src/os2_defines.h 2001/01/01 01:09:07
+@@ -13,16 +13,22 @@
#ifndef OS2_DEFINES_H
#define OS2_DEFINES_H
#include <cctype>
-#include <process.h>
#include <cstdlib>
++extern "C" inline int readlink(const char *, char *, size_t) {return -1;}
+#else
+#include <ctype.h>
+#include <stdlib.h>
++#define readlink(s, t, l) (-1)
+#endif
+#include <process.h>
#include <unistd.h>
#include <X11/Xlocale.h>
/* #include <malloc.h> */
+ #define lstat stat
+ #define S_ISLNK(x) false
+ #define S_ISBLK(x) false
+-#define readlink(s, t, l) (strcpy(t, s), strlen(t))
+ /*#define mkfifo(p, m) (0) *//* LyXserver is temporary disabled. */
+ #define chdir _chdir2
+ #define strcasecmp stricmp
+Index: lyx-devel/src/support/rename.C
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/rename.C,v
+retrieving revision 1.5
+diff -u -r1.5 rename.C
+--- lyx-devel/src/support/rename.C 2000/11/13 10:35:02 1.5
++++ lyx-devel/src/support/rename.C 2001/01/01 01:09:10
+@@ -6,6 +6,9 @@
+
+ bool lyx::rename(string const & from, string const & to)
+ {
++#ifdef __EMX__
++ ::unlink(to.c_str());
++#endif
+ if (::rename(from.c_str(), to.c_str()) == -1)
+ if (lyx::copy(from, to)) {
+ lyx::unlink(from);
+Index: lyx-devel/src/support/syscall.C
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/syscall.C,v
+retrieving revision 1.18
+diff -u -r1.18 syscall.C
+--- lyx-devel/src/support/syscall.C 2000/10/11 21:06:43 1.18
++++ lyx-devel/src/support/syscall.C 2001/01/01 01:09:10
+@@ -15,6 +15,7 @@
+ #include "syscontr.h"
+ #include "support/lstrings.h"
+ #include "support/lyxlib.h"
++#include "support/filetools.h"
+
+ using std::endl;
+
+Index: lyx-devel/src/support/tempname.C
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/tempname.C,v
+retrieving revision 1.4
+diff -u -r1.4 tempname.C
+--- lyx-devel/src/support/tempname.C 2000/11/15 03:22:08 1.4
++++ lyx-devel/src/support/tempname.C 2001/01/01 01:09:10
+@@ -12,6 +12,17 @@
+
+ extern string system_tempdir;
+
++#ifdef __EMX__
++ // EMX mkstemp() behaviour may be problematic, however,
++ // as noted by Lgb in the comment to CreateTmpDir(),
++ // there is no point for using mkstemp() here.
++#undef HAVE_MKSTEMP
++#include <sys/types.h>
++#include <sys/stat.h>
++#define INCL_DOSFILEMGR
++#include <os2.h>
++#endif
++
+ static inline
+ int make_tempfile(char * templ)
+ {
+@@ -19,9 +30,14 @@
+ return ::mkstemp(templ);
+ #else
+ #ifdef HAVE_MKTEMP
++#ifdef __EMX__
++ ULONG cur = 0;
++ LONG req = 1;
++ DosSetRelMaxFH(&req, &cur); // No need to check error code.
++#endif
+ // This probably just barely works...
+ ::mktemp(templ);
+- return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
++ return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+ #else
+ #warning FIX FIX FIX
+ #endif
projects / lyx.git / blobdiff