dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[dotgnu-pnet-commits] pnet ChangeLog configure.in


From: Klaus Treichel
Subject: [dotgnu-pnet-commits] pnet ChangeLog configure.in
Date: Sat, 11 Mar 2006 12:06:19 +0000

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Branch:         
Changes by:     Klaus Treichel <address@hidden> 06/03/11 12:06:18

Modified files:
        .              : ChangeLog configure.in 

Log message:
        2006-03-11  Klaus Treichel  <address@hidden>
        
        * configure.in: Add new sonfigure switch --with-cvm which defines
        IL_USE_CVM. The cvm coder is used by default. Disable libffi when using 
the
        jit coder.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/ChangeLog.diff?tr1=1.3303&tr2=1.3304&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/configure.in.diff?tr1=1.215&tr2=1.216&r1=text&r2=text

Patches:
Index: pnet/ChangeLog
diff -u pnet/ChangeLog:1.3303 pnet/ChangeLog:1.3304
--- pnet/ChangeLog:1.3303       Thu Mar  9 19:09:29 2006
+++ pnet/ChangeLog      Sat Mar 11 12:06:16 2006
@@ -1,3 +1,9 @@
+2006-03-11  Klaus Treichel  <address@hidden>
+
+       * configure.in: Add new sonfigure switch --with-cvm which defines
+       IL_USE_CVM. The cvm coder is used by default. Disable libffi when using 
the
+       jit coder.
+
 2006-03-09  Klaus Treichel  <address@hidden>
 
        * engine/jitc.c: Allocate one more arg for the pointer to the return 
struct
Index: pnet/configure.in
diff -u pnet/configure.in:1.215 pnet/configure.in:1.216
--- pnet/configure.in:1.215     Wed Feb  8 20:26:58 2006
+++ pnet/configure.in   Sat Mar 11 12:06:18 2006
@@ -104,27 +104,39 @@
        withgc=yes
 ])
 
+dnl check which type of engine should be built
+
+AC_ARG_WITH(cvm,
+[  --with-cvm             Use the CVM interpreter],
+[
+       AC_DEFINE([IL_USE_CVM], 1, [Use the CVM interpreter])
+       withcvm=yes
+],
+[
+       withcvm=no
+])
+
 dnl this should check correctly for libjit
 
 AC_DEFUN([AC_LIBJIT], [
-        if $search_libjit
-        then
-                if test -f $1/$2
-                then
-                        AC_MSG_RESULT($1/$2)
-                        JIT_LIBS="$3"
-                        JIT_INCLUDE="$4"
-                        search_libjit=false
-                        jit=true
-    fi
-  fi
+       if $search_libjit
+       then
+               if test -f $1/$2
+               then
+                       AC_MSG_RESULT($1/$2)
+                       JIT_LIBS="$3"
+                       JIT_INCLUDE="$4"
+                       search_libjit=false
+                       jit=true
+               fi
+       fi
 ])
 
 AC_DEFUN([AC_SEARCH_LIBJIT], [
-        AC_MSG_CHECKING([location of libjit])
-        AC_LIBJIT(../libjit/include/jit,jit.h, -ljit -L../../libjit/jit/.libs, 
-I../../libjit/include, "../libjit")
-        AC_LIBJIT(/usr/include/jit, jit.h, -ljit, -I/usr/include, "/usr")
-        AC_LIBJIT(/usr/local/include/jit, jit.h, -ljit, -I/usr/local/include, 
"/usr/local")
+       AC_MSG_CHECKING([location of libjit])
+       AC_LIBJIT(../libjit/include/jit,jit.h, -ljit -L../../libjit/jit/.libs, 
-I../../libjit/include, "../libjit")
+       AC_LIBJIT(/usr/include/jit, jit.h, -ljit, -I/usr/include, "/usr")
+       AC_LIBJIT(/usr/local/include/jit, jit.h, -ljit, -I/usr/local/include, 
"/usr/local")
 ])
 
 AC_SUBST(JIT_LIBS)
@@ -132,16 +144,37 @@
 search_libjit=false
 AC_ARG_WITH(jit,
 [  --with-jit             Use the Just In Time compiler],
-if test x$withval = xyes ; then
-        search_libjit=true
-        AC_DEFINE([IL_USE_JIT], 1, [Use the just in time compiler])
-elif test x$withval != xyes ; then
-        JIT_LIBS="$LIBS -L$withval/lib -ljit"
-        JIT_INCLUDE="-I$withval/include"
-        search_libjit=false
-        AC_DEFINE([IL_USE_JIT], 1, [Use the just in time compiler])
+[
+       if test x$withval = xyes ; then
+               search_libjit=true
+               AC_DEFINE([IL_USE_JIT], 1, [Use the just in time compiler])
+               withjit=yes
+               withffi=no
+       elif test x$withval != xyes ; then
+               JIT_LIBS="$LIBS -L$withval/lib -ljit"
+               JIT_INCLUDE="-I$withval/include"
+               search_libjit=false
+               AC_DEFINE([IL_USE_JIT], 1, [Use the just in time compiler])
+               withjit=yes
+               withffi=no
+       fi
+],
+[
+       withjit=no
+])
+
+dnl Make sure one engine type is selected
+
+if test x$withjit = xyes ; then
+       if test x$withcvm = xyes ; then
+               AC_MSG_ERROR(Only one engine type can be selected. Either 
--with-jit or --with-cvm.)
+       fi
+elif test x$withjit = xno ; then
+       if test x$withcvm = xno ; then
+               AC_DEFINE([IL_USE_CVM], 1, [Use the CVM interpreter])
+               withcvm=yes
+       fi
 fi
-)
 
 if $search_libjit
 then




reply via email to

[Prev in Thread] Current Thread [Next in Thread]