[Dotgnu-pnet-commits] CVS: pnetC ChangeLog,1.12,1.13 configure.in,1.8,1.9

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetC
In directory subversions:/tmp/cvs-serv475

Modified Files:
        ChangeLog configure.in 
Log Message:


Look for OpenSystem.C.dll and mscorlib.dll in pnetlib, not pnet.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetC/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** ChangeLog   2 Sep 2002 04:13:01 -0000       1.12
--- ChangeLog   8 Dec 2002 04:05:40 -0000       1.13
***************
*** 1,3 ****
--- 1,8 ----
  
+ 2002-12-08  Rhys Weatherley  <address@hidden>
+ 
+       * configure.in, samples/ilrun.sh.in: look for OpenSystem.C.dll and
+       mscorlib.dll in pnetlib, not pnet.
+ 
  2002-09-02  Rhys Weatherley  <address@hidden>
  

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetC/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** configure.in        2 Sep 2002 04:13:01 -0000       1.8
--- configure.in        8 Dec 2002 04:05:40 -0000       1.9
***************
*** 29,32 ****
--- 29,53 ----
  ])
  
+ dnl The --with-pnetlib option can be used to specify the location of
+ dnl the Portable.NET C# library, so that we know where to get the
+ dnl mscorlib.dll assembly to use with "ilrun".  The default location
+ dnl is assumed to be "../pnetlib".
+ AC_SUBST(PNETLIB_PATH)
+ AC_ARG_WITH(pnetlib,
+ [  --with-pnetlib=DIR      specify the location of pnetlib],
+ [
+       if test -n "$withval"; then
+               case "$withval" in
+                 ../*) PNETLIB_PATH="`pwd`/$withval" ;;
+                    *) PNETLIB_PATH="$withval" ;;
+               esac
+       else
+               PNETLIB_PATH="`pwd`/../pnetlib"
+       fi
+ ],
+ [
+       PNETLIB_PATH="`pwd`/../pnetlib"
+ ])
+ 
  dnl The --with-32bit option can be used to force a 32-bit only build.
  AC_SUBST(LIBRARY_SUFFIX)
***************
*** 59,67 ****
        CFLAGS="$CFLAGS -fplugin-c-path=$PNET_PATH/cscc/cscc-c-s"
  fi
! if test -f "$PNET_PATH/csupport/OpenSystem.C.dll" ; then
!       CFLAGS="$CFLAGS -L$PNET_PATH/csupport"
  fi
! if test -f "$PNET_PATH/samples/mscorlib.dll" ; then
!       CFLAGS="$CFLAGS -L$PNET_PATH/samples"
  fi
  
--- 80,88 ----
        CFLAGS="$CFLAGS -fplugin-c-path=$PNET_PATH/cscc/cscc-c-s"
  fi
! if test -f "$PNETLIB_PATH/csupport/OpenSystem.C.dll" ; then
!       CFLAGS="$CFLAGS -L$PNETLIB_PATH/csupport"
  fi
! if test -f "$PNETLIB_PATH/runtime/mscorlib.dll" ; then
!       CFLAGS="$CFLAGS -L$PNETLIB_PATH/runtime"
  fi