Re: Patch for cygwin lib/configure

2003-09-07 Thread Kayvan A. Sylvan
On Mon, Sep 08, 2003 at 01:39:58AM +, Angus Leeming wrote:
> Kayvan A. Sylvan wrote:
> 
> > I had to do this to make cygwin with the latest tetex packages compile
> > correctly.
> 
> Doesn't work on my box:
> 
> make[2]: Entering directory `/home/angus/lyx/devel/build/lib'
> /bin/sh ../../lib/configure
> ../../lib/configure: line 103: syntax error near unexpected token `;;'
> ../../lib/configure: line 103: `   echo "srcdir=${srcdir}" ;;'
> make[2]: *** [lyxrc.defaults] Error 2
> 

Okay. Can you send me your lib/configure so I can check what I did wrong?

-- 
Kayvan A. Sylvan  | Proud husband of   | Father to my kids:
Sylvan Associates, Inc.   | Laura Isabella Sylvan  | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)


Re: Patch for cygwin lib/configure

2003-09-07 Thread Angus Leeming
Angus Leeming wrote:

> Kayvan A. Sylvan wrote:
> 
>> I had to do this to make cygwin with the latest tetex packages compile
>> correctly.
> 
> Doesn't work on my box:

Ok, but this does (moved the ';;' to the end of the case block). Committed.

-- 
Angus? lib/reLyX-safe
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.508
diff -u -p -r1.508 ChangeLog
--- lib/ChangeLog	4 Sep 2003 23:09:40 -	1.508
+++ lib/ChangeLog	8 Sep 2003 00:43:52 -
@@ -1,3 +1,10 @@
+2003-09-07  Kayvan Sylvan  <[EMAIL PROTECTED]>
+
+	* configure.m4 - Do an additional test in the Cygwin case to
+	see if the path correction is necessary. If running with newer
+	cygwin tetex packages, the path correction actually appears to
+	fail.
+
 2003-09-05  Johnathan Burchill  <[EMAIL PROTECTED]>
 
 	* external_templates: Write a message to the latex log file if the
Index: lib/configure.m4
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.69
diff -u -p -r1.69 configure.m4
--- lib/configure.m4	14 Aug 2003 15:45:02 -	1.69
+++ lib/configure.m4	8 Sep 2003 00:43:52 -
@@ -176,9 +176,22 @@ fi
  Adjust PATH for Win32 (Cygwin)
 case `uname -s` in
CYGWIN*)
- echo "configure: cygwin detected; path correction"
- srcdir=`cygpath -w "${srcdir}" | tr '' /`
- echo "srcdir=${srcdir}" ;;
+ tmpfname="/tmp/x$$.ltx";
+ echo "\\documentstyle{article}" > $tmpfname
+ echo "\\begin{document}\\end{document}" >> $tmpfname
+ inpname=`cygpath -w $tmpfname | tr '' /`
+ echo "\\input{$inpname}" > wrap_temp$$.ltx
+ check_err=`latex wrap_temp$$.ltx 2>&1 < /dev/null | grep Error`
+ rm -f wrap_temp$$.* /tmp/x$$.*
+ if [ x"$check_err" = "x" ]
+ then
+   echo "configure: cygwin detected; path correction"
+   srcdir=`cygpath -w "${srcdir}" | tr '' /`
+   echo "srcdir=${srcdir}"
+ else
+   echo "configure: cygwin detected; path correction is not needed"
+ fi
+ ;;
 esac
 
  Create the build directories if necessary


Re: Patch for cygwin lib/configure

2003-09-07 Thread Angus Leeming
Kayvan A. Sylvan wrote:

> I had to do this to make cygwin with the latest tetex packages compile
> correctly.

Doesn't work on my box:

make[2]: Entering directory `/home/angus/lyx/devel/build/lib'
/bin/sh ../../lib/configure
../../lib/configure: line 103: syntax error near unexpected token `;;'
../../lib/configure: line 103: `   echo "srcdir=${srcdir}" ;;'
make[2]: *** [lyxrc.defaults] Error 2

-- 
Angus