jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for detecting the different C# compilers/interpreters

Browse source 
Neaten 'configure --help' output


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5013 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-08-27 09:29:46 +00:00
commit 1ef748c8e6
1 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
SWIG/configure.in
View file

@ -638,8 +638,8 @@ AC_SUBST(PERL5CCFLAGS)
# Look for java # Look for java
#---------------------------------------------------------------- #----------------------------------------------------------------
AC_ARG_WITH(java, [ --with-java=path Set location of Java],[JAVABIN="$withval"], [JAVABIN=]) AC_ARG_WITH(java, [ --with-java=path Set location of Java executable],[JAVABIN="$withval"], [JAVABIN=])
AC_ARG_WITH(javac, [ --with-javac=path Set location of Javac],[JAVACBIN="$withval"], [JAVACBIN=]) AC_ARG_WITH(javac, [ --with-javac=path Set location of Javac executable],[JAVACBIN="$withval"], [JAVACBIN=])
if test -z "$JAVABIN" ; then if test -z "$JAVABIN" ; then
AC_CHECK_PROGS(JAVA, java kaffe guavac) AC_CHECK_PROGS(JAVA, java kaffe guavac)
@ -1208,18 +1208,26 @@ AC_SUBST(CHICKENSHAREDLIB)
AC_ARG_WITH(cil-interpreter, [ --with-cil-interpreter=path Set location of CIL interpreter for CSharp],[CSHARPBIN="$withval"], [CSHARPBIN=]) AC_ARG_WITH(cil-interpreter, [ --with-cil-interpreter=path Set location of CIL interpreter for CSharp],[CSHARPBIN="$withval"], [CSHARPBIN=])
AC_ARG_WITH(csharp-compiler, [ --with-csharp-compiler=path Set location of CSharp compiler],[CSHARPCOMPILERBIN="$withval"], [CSHARPCOMPILERBIN=]) AC_ARG_WITH(csharp-compiler, [ --with-csharp-compiler=path Set location of CSharp compiler],[CSHARPCOMPILERBIN="$withval"], [CSHARPCOMPILERBIN=])
if test -z "$CSHARPBIN" ; then
AC_CHECK_PROGS(CSHARPCILINTERPRETER, ilrun mono)
else
CSHARPCILINTERPRETER="$CSHARPBIN"
fi
if test -z "$CSHARPCOMPILERBIN" ; then if test -z "$CSHARPCOMPILERBIN" ; then
AC_CHECK_PROGS(CSHARPCOMPILER, cscc mcs csc) case $host in
*-*-cygwin* | *-*-mingw*)
AC_CHECK_PROGS(CSHARPCOMPILER, mcs.bat cscc csc);;
*)AC_CHECK_PROGS(CSHARPCOMPILER, mcs cscc);;
esac
else else
CSHARPCOMPILER="$CSHARPCOMPILERBIN" CSHARPCOMPILER="$CSHARPCOMPILERBIN"
fi fi
if test -z "$CSHARPBIN" ; then
if test "cscc" = "$CSHARPCOMPILER" ; then
AC_CHECK_PROGS(CSHARPCILINTERPRETER, ilrun)
else
CSHARPCILINTERPRETER=""
fi
else
CSHARPCILINTERPRETER="$CSHARPBIN"
fi
# Cygwin requires the Windows standard (Pascal) calling convention as it is a Windows executable and not a Cygwin built executable # Cygwin requires the Windows standard (Pascal) calling convention as it is a Windows executable and not a Cygwin built executable
case $host in case $host in
*-*-cygwin* | *-*-mingw*) *-*-cygwin* | *-*-mingw*)
@ -1343,8 +1351,12 @@ AC_SUBST(SKIP_CHICKEN)
SKIP_CSHARP= SKIP_CSHARP=
if test -z "$CSHARPCILINTERPRETER" || test -z "$CSHARPCOMPILER" ; then if test -z "$CSHARPCOMPILER" ; then
SKIP_CSHARP="1" SKIP_CSHARP="1"
else
if test "cscc" = "$CSHARPCOMPILER" && test -z "$CSHARPCILINTERPRETER" ; then
SKIP_CSHARP="1"
fi
fi fi
AM_CONDITIONAL(SKIP_CSHARP, test -n "$SKIP_CSHARP") AM_CONDITIONAL(SKIP_CSHARP, test -n "$SKIP_CSHARP")
AC_SUBST(SKIP_CSHARP) AC_SUBST(SKIP_CSHARP)