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

Detect mono C# compiler on newer linux distributions

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13973 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-12-15 23:41:01 +00:00
commit 6f819d1cd1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/csharp/Makefile.in
View file

@ -72,7 +72,7 @@ run_testcase = \
$(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \ $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
CSHARPFLAGS='-nologo -debug+ $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \ CSHARPFLAGS='-nologo -debug+ $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile && \ CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile && \
env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_FALLBACK_LIBRARY_PATH= $(RUNTOOL) $(INTERPRETER) $(INTERPRETER_FLAGS) $*_runme.exe; \ env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_FALLBACK_LIBRARY_PATH= $(RUNTOOL) $(INTERPRETER) $(INTERPRETER_FLAGS) ./$*_runme.exe; \
else \ else \
cd $* && \ cd $* && \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \

6
configure.in
View file

@ -1771,19 +1771,19 @@ if test -z "$CSHARPCOMPILERBIN" ; then
case $host in case $host in
*-*-cygwin* | *-*-mingw*) *-*-cygwin* | *-*-mingw*)
# prefer Mono gmcs (.NET 2.0) over mcs (.NET 1.1) - note mcs-1.2.3 has major pinvoke bug # prefer Mono gmcs (.NET 2.0) over mcs (.NET 1.1) - note mcs-1.2.3 has major pinvoke bug
AC_CHECK_PROGS(CSHARPCOMPILER, csc gmcs mcs cscc) AC_CHECK_PROGS(CSHARPCOMPILER, csc mono-csc gmcs mcs cscc)
if test -n "$CSHARPCOMPILER" && test "$CSHARPCOMPILER" = "csc" ; then if test -n "$CSHARPCOMPILER" && test "$CSHARPCOMPILER" = "csc" ; then
AC_MSG_CHECKING(whether csc is the Microsoft CSharp compiler) AC_MSG_CHECKING(whether csc is the Microsoft CSharp compiler)
csc 2>/dev/null | grep "C#" > /dev/null || CSHARPCOMPILER="" csc 2>/dev/null | grep "C#" > /dev/null || CSHARPCOMPILER=""
if test -z "$CSHARPCOMPILER" ; then if test -z "$CSHARPCOMPILER" ; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_CHECK_PROGS(CSHARPCOMPILER, gmcs mcs cscc) AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
fi fi
fi fi
;; ;;
*)AC_CHECK_PROGS(CSHARPCOMPILER, gmcs mcs cscc);; *)AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc);;
esac esac
else else
CSHARPCOMPILER="$CSHARPCOMPILERBIN" CSHARPCOMPILER="$CSHARPCOMPILERBIN"