development/OS2/quick_fix.patch

   1 diff -ubr -X g:/exclude lyx-devel/config/progtest.m4 lyx-build/config/progtest.m4
   2 --- lyx-devel/config/progtest.m4        Tue Feb 22 06:44:28 2000
   3 +++ lyx-build/config/progtest.m4        Wed May 10 10:12:44 2000
   4 @@ -11,6 +11,19 @@
   5  dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
   6  dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
   7  AC_DEFUN(AM_PATH_PROG_WITH_TEST,
   8 +[case "`uname -s 2> /dev/null`" in
   9 +OS/2)
  10 +  PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
  11 +  PATH_IFS=';'
  12 +  EXE_EXT='.exe'
  13 +  CMD_EXT='.cmd'
  14 +  ;;
  15 +*)
  16 +  PATH_IFS=':'
  17 +  EXE_EXT=''
  18 +  CMD_EXT=''
  19 +  ;;
  20 +esac]
  21  [# Extract the first word of "$2", so it can be a program name with args.
  22  set dummy $2; ac_word=[$]2
  23  AC_MSG_CHECKING([for $ac_word])
  24 @@ -20,10 +33,12 @@
  25    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
  26    ;;
  27    *)
  28 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
  29 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
  30    for ac_dir in ifelse([$5], , $PATH, [$5]); do
  31      test -z "$ac_dir" && ac_dir=.
  32 -    if test -f $ac_dir/$ac_word; then
  33 +    if test -f $ac_dir/$ac_word \
  34 +        -o -f $ac_dir/$ac_word$EXE_EXT \
  35 +        -o -f $ac_dir/$ac_word$CMD_EXT; then
  36        if [$3]; then
  37         ac_cv_path_$1="$ac_dir/$ac_word"
  38         break
  39 diff -ubr -X g:/exclude lyx-devel/lib/configure.m4 lyx-build/lib/configure.m4
  40 --- lyx-devel/lib/configure.m4  Tue Feb 22 06:44:42 2000
  41 +++ lyx-build/lib/configure.m4  Wed May 10 07:24:02 2000
  42 @@ -28,6 +28,19 @@
  43  dnl
  44  define(SEARCH_PROG,[dnl
  45  changequote([,])dnl
  46 +case "`uname -s 2> /dev/null`" in
  47 +OS/2)
  48 +  PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
  49 +  PATH_IFS=';'
  50 +  EXE_EXT='.exe'
  51 +  CMD_EXT='.cmd'
  52 +  ;;
  53 +*)
  54 +  PATH_IFS=':'
  55 +  EXE_EXT=''
  56 +  CMD_EXT=''
  57 +  ;;
  58 +esac
  59  MSG_CHECKING($1)
  60  MSG_RESULT(($3))
  61  $2=
  62 @@ -37,10 +50,12 @@
  63  set dummy $ac_prog ; ac_word=$[2]
  64  if test -n "$ac_word"; then
  65    MSG_CHECKING([for \"$ac_word\"],[+])
  66 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
  67 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS"
  68    for ac_dir in $PATH; do
  69      test -z "$ac_dir" && ac_dir=.
  70 -    if test -x [$ac_dir/$ac_word]; then
  71 +    if test -x [$ac_dir/$ac_word] \
  72 +        -o -x [$ac_dir/$ac_word$EXE_EXT] \
  73 +        -o -x [$ac_dir/$ac_word$CMD_EXT]; then
  74        $2="$ac_prog"
  75        break
  76      fi
  77 @@ -179,8 +194,17 @@
  78  fi
  79
  80  # Search for an installed reLyX or a ready-to-install one
  81 +case "`uname -s 2> /dev/null`" in
  82 +OS/2)
  83 +save_PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
  84 +PATH_IFS=';'
  85 +;;
  86 +*)
  87  save_PATH=${PATH}
  88 -PATH=${PATH}:./reLyX/
  89 +PATH_IFS=':'
  90 +;;
  91 +esac
  92 +PATH=${PATH}${PATH_IFS}./reLyX/
  93  SEARCH_PROG([for reLyX LaTeX-to-LyX translator],RELYX,reLyX)
  94  PATH=${save_PATH}
  95
  96 diff -ubr -X g:/exclude lyx-devel/lib/reLyX/acinclude.m4 lyx-build/lib/reLyX/acinclude.m4
  97 --- lyx-devel/lib/reLyX/acinclude.m4    Tue Sep 28 03:44:34 1999
  98 +++ lyx-build/lib/reLyX/acinclude.m4    Wed May 10 05:38:36 2000
  99 @@ -11,15 +11,24 @@
 100  dnl RELYX_SEARCH_PROG(VARIABLE-NAME,PROGRAMS-LIST,ACTION-IF-FOUND)
 101  dnl
 102  define(RELYX_SEARCH_PROG,[dnl
 103 +case "`uname -s 2> /dev/null`" in
 104 +OS/2)
 105 +  PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
 106 +  PATH_IFS=';'
 107 +  ;;
 108 +*)
 109 +  PATH_IFS=':'
 110 +  ;;
 111 +esac
 112  for ac_prog in $2 ; do
 113  # Extract the first word of "$ac_prog", so it can be a program name with
 114  # args.
 115    set dummy $ac_prog ; ac_word=$[2]
 116    if test ! -n "[$]$1"; then
 117 -    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
 118 +    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
 119      for ac_dir in $PATH; do
 120        test -z "$ac_dir" && ac_dir=.
 121 -      if test -f [$ac_dir/$ac_word]; then
 122 +      if test -f [$ac_dir/$ac_word] -o -f [$ac_dir/$ac_word$ac_exeext]; then
 123          $1="$ac_prog"
 124          break
 125        fi
 126 diff -ubr -X g:/exclude lyx-devel/lib/reLyX/configure.in lyx-build/lib/reLyX/configure.in
 127 --- lyx-devel/lib/reLyX/configure.in    Tue Feb 22 06:45:24 2000
 128 +++ lyx-build/lib/reLyX/configure.in    Wed May 10 05:38:34 2000
 129 @@ -2,6 +2,7 @@
 130  AC_INIT(reLyX.in)
 131  AC_PREREQ(2.13) dnl We want to use autoconf 2.13
 132  AC_CONFIG_AUX_DIR(../../config)
 133 +AC_EXEEXT
 134
 135  dnl PACKAGE=reLyX
 136  dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
 137 diff -ubr -X g:/exclude lyx-devel/src/os2_defines.h lyx-build/src/os2_defines.h
 138 --- lyx-devel/src/os2_defines.h Fri Mar 10 06:25:50 2000
 139 +++ lyx-build/src/os2_defines.h Fri May  5 11:37:48 2000
 140 @@ -13,9 +13,14 @@
 141  #ifndef OS2_DEFINES_H
 142  #define OS2_DEFINES_H
 143
 144 +#if defined (__cplusplus)
 145  #include <cctype>
 146 -#include <process.h>
 147  #include <cstdlib>
 148 +#else
 149 +#include <ctype.h>
 150 +#include <stdlib.h>
 151 +#endif
 152 +#include <process.h>
 153  #include <unistd.h>
 154  #include <X11/Xlocale.h>
 155  /* #include <malloc.h> */