[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.559,1.560 configure.in,1.57,1.58

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib
In directory subversions:/tmp/cvs-serv6997

Modified Files:
        ChangeLog configure.in 
Log Message:


Use "cygpath" to convert the "cscc" and "cscc-cs" pathnames into
Windows form under Cygwin.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.559
retrieving revision 1.560
diff -C2 -r1.559 -r1.560
*** ChangeLog   16 Dec 2002 05:25:41 -0000      1.559
--- ChangeLog   16 Dec 2002 06:25:47 -0000      1.560
***************
*** 9,12 ****
--- 9,15 ----
        used when calling "link_res.sh".
  
+       * configure.in: use "cygpath" to convert the "cscc" and
+       "cscc-cs" pathnames into Windows form under Cygwin.
+ 
  2002-12-15  Aditya P. Bansod <address@hidden>
  

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/configure.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** configure.in        16 Dec 2002 05:25:41 -0000      1.57
--- configure.in        16 Dec 2002 06:25:47 -0000      1.58
***************
*** 8,11 ****
--- 8,12 ----
  AC_SUBST(CSANT_FLAGS)
  AC_SUBST(CSHARP_COMPILER)
+ AC_SUBST(CSHARP_COMPILER_CYGWIN)
  AC_SUBST(CSHARP_PLUGIN)
  AC_SUBST(CSCC_FLAGS)
***************
*** 22,25 ****
--- 23,27 ----
  AC_PROG_LN_S
  AC_PROG_MAKE_SET
+ AC_PATH_PROG(CYGPATH, cygpath)
  
  dnl The --with-pnet option can be used to specify the location of
***************
*** 92,97 ****
--- 94,109 ----
                fi
                CSANT_FLAGS='--compiler csc -Dcsc="$(CSHARP_COMPILER)" 
--profile "$(top_srcdir)/profiles/$(PROFILE_NAME)"'
+               CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
        else
                AC_PATH_PROG(CSHARP_PLUGIN, cscc-cs,, 
$PNET_PATH/cscc:${prefix}/lib/cscc/plugins:${prefix}/bin:$PATH)
+               if test "x$CYGPATH" = "xno" ; then
+                       CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
+               else
+                       # Convert the cscc and cscc-cs paths into their Windows
+                       # forms, to ensure that spawns from csant work 
correctly.
+                       CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
+                       CSHARP_COMPILER=`cygpath -w "$CSHARP_COMPILER"`
+                       CSHARP_PLUGIN=`cygpath -w "$CSHARP_PLUGIN"`
+               fi
                CSANT_FLAGS='--compiler cscc -Dcscc="$(CSHARP_COMPILER)" 
-Dcscc.plugins.cs="$(CSHARP_PLUGIN)" --profile 
"$(top_srcdir)/profiles/$(PROFILE_NAME)"'
        fi
***************
*** 105,108 ****
--- 117,121 ----
        fi
        CSANT_FLAGS='--compiler csc -Dcsc="$(CSHARP_COMPILER)" --profile 
"$(top_srcdir)/profiles/$(PROFILE_NAME)"'
+       CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
  fi