initial import

2025-06-22 20:39:04 -05:00
commit f8a70886f0
3428 changed files with 302546 additions and 0 deletions
--- a/swig/remove-csharp-and-java-support.patch
+++ b/swig/remove-csharp-and-java-support.patch
@@ -0,0 +1,948 @@
+diff --git a/Examples/Makefile.in b/Examples/Makefile.in
+index 87386f7..faa57f8 100644
+--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
+@@ -597,75 +597,6 @@ guile_clean:
+ 	rm -f *.@OBJEXT@ *$(GUILE_SO)
+ 
+ ##################################################################
+-#####                       JAVA                            ######
+-##################################################################
+-
+-# You need to set this variable to the java directories containing the
+-# files "jni.h" and "md.h"
+-# usually something like /usr/java/include and /usr/java/include/<arch-osname>.
+-JAVA_INCLUDE= @JAVAINC@
+-
+-# Extra Java specific dynamic linking options
+-JAVA_DLNK  = @JAVADYNAMICLINKING@
+-JAVA_LIBPREFIX = @JAVALIBRARYPREFIX@
+-JAVASO =@JAVASO@
+-JAVALDSHARED = @JAVALDSHARED@
+-JAVACXXSHARED = @JAVACXXSHARED@
+-JAVACFLAGS = @JAVACFLAGS@
+-JAVAFLAGS = @JAVAFLAGS@
+-JAVA = @JAVA@
+-JAVAC = @JAVAC@ -d .
+-
+-# ----------------------------------------------------------------
+-# Build a java dynamically loadable module (C)
+-# ----------------------------------------------------------------
+-
+-java: $(SRCDIR_SRCS)
+-	$(SWIG) -java $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
+-	$(CC) -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(JAVACFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE)
+-	$(JAVALDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
+-
+-# ----------------------------------------------------------------
+-# Build a java dynamically loadable module (C++)
+-# ----------------------------------------------------------------
+-
+-java_cpp: $(SRCDIR_SRCS)
+-	$(SWIG) -java -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
+-	$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(JAVACFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE)
+-	$(JAVACXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
+-
+-# ----------------------------------------------------------------
+-# Compile java files
+-# ----------------------------------------------------------------
+-
+-java_compile: $(SRCDIR_SRCS)
+-	$(COMPILETOOL) $(JAVAC) $(addprefix $(SRCDIR),$(JAVASRCS))
+-
+-# -----------------------------------------------------------------
+-# Run java example
+-# -----------------------------------------------------------------
+-
+-java_run:
+-	env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) $(JAVA) $(JAVAFLAGS) $(RUNME) $(RUNPIPE)
+-
+-# -----------------------------------------------------------------
+-# Version display
+-# -----------------------------------------------------------------
+-
+-java_version:
+-	$(JAVA) -version
+-	$(JAVAC) -version || echo "Unknown javac version"
+-
+-# -----------------------------------------------------------------
+-# Cleaning the java examples
+-# -----------------------------------------------------------------
+-
+-java_clean:
+-	rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v $(RUNME).java`
+-	rm -f core @EXTRA_CLEAN@
+-	rm -f *.@OBJEXT@ *@JAVASO@
+-
+-##################################################################
+ #####                       JAVASCRIPT                      ######
+ ##################################################################
+ 
+@@ -776,61 +707,6 @@ javascript_clean:
+ 	cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean
+ 
+ ##################################################################
+-#####                       ANDROID                         ######
+-##################################################################
+-
+-ANDROID = @ANDROID@
+-ANDROID_NDK_BUILD = @NDKBUILD@
+-ANDROID_ADB = @ADB@
+-ANT = @ANT@
+-TARGETID = 1
+-
+-# ----------------------------------------------------------------
+-# Build an Android dynamically loadable module (C)
+-# ----------------------------------------------------------------
+-
+-android: $(SRCDIR_SRCS)
+-	$(ANDROID) $(SILENT_OPTION) update project --target $(TARGETID) --name $(PROJECTNAME) --path .
+-	$(SWIG) -java $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.c $(INTERFACEPATH)
+-	+$(ANDROID_NDK_BUILD) $(SILENT_PIPE)
+-	$(ANT) $(ANT_QUIET) debug
+-
+-# ----------------------------------------------------------------
+-# Build an Android dynamically loadable module (C++)
+-# ----------------------------------------------------------------
+-
+-android_cpp: $(SRCDIR_SRCS)
+-	$(ANDROID) $(SILENT_OPTION) update project --target $(TARGETID) --name $(PROJECTNAME) --path .
+-	$(SWIG) -java -c++ $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.cpp $(INTERFACEPATH)
+-	+$(ANDROID_NDK_BUILD) $(SILENT_PIPE)
+-	$(ANT) $(ANT_QUIET) debug
+-
+-# ----------------------------------------------------------------
+-# Android install
+-# ----------------------------------------------------------------
+-
+-android_install:
+-	-$(ANDROID_ADB) uninstall $(PACKAGENAME)
+-	$(ANDROID_ADB) install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
+-
+-# -----------------------------------------------------------------
+-# Version display
+-# -----------------------------------------------------------------
+-
+-android_version:
+-	$(ANDROID_ADB) version
+-
+-# -----------------------------------------------------------------
+-# Cleaning the Android examples
+-# -----------------------------------------------------------------
+-
+-android_clean:
+-	test -n "$(SRCDIR)" && cd $(SRCDIR) ; $(ANT) -q -logfile /dev/null clean
+-	rm -f $(INTERFACEDIR)$(TARGET)_wrap.*
+-	rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
+-	rm -rf obj
+-
+-##################################################################
+ #####                       MZSCHEME                        ######
+ ##################################################################
+ 
+@@ -1106,78 +982,6 @@ php_clean:
+ 	rm -f *.@OBJEXT@ *$(PHP_SO)
+ 
+ ##################################################################
+-#####                      CSHARP                           ######
+-##################################################################
+-
+-# Extra CSharp specific dynamic linking options
+-CSHARP_DLNK  = @CSHARPDYNAMICLINKING@
+-CSHARP_LIBPREFIX = @CSHARPLIBRARYPREFIX@
+-CSHARPCOMPILER = @CSHARPCOMPILER@
+-CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
+-CSHARPCILINTERPRETER_FLAGS = @CSHARPCILINTERPRETER_FLAGS@
+-CSHARPCFLAGS = @CSHARPCFLAGS@
+-CSHARPFLAGS =
+-CSHARPOPTIONS =
+-CSHARPSO = @CSHARPSO@
+-CSHARP_RUNME = ./$(RUNME).exe
+-
+-# ----------------------------------------------------------------
+-# Build a CSharp dynamically loadable module (C)
+-# ----------------------------------------------------------------
+-
+-csharp: $(SRCDIR_SRCS)
+-	$(SWIG) -csharp $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
+-	$(CC) -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(CSHARPCFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES)
+-	$(LDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO)
+-
+-# ----------------------------------------------------------------
+-# Build a CSharp dynamically loadable module (C++)
+-# ----------------------------------------------------------------
+-
+-csharp_cpp: $(SRCDIR_SRCS)
+-	$(SWIG) -csharp -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
+-	$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(CSHARPCFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES)
+-	$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO)
+-
+-# ----------------------------------------------------------------
+-# Compile CSharp files
+-# ----------------------------------------------------------------
+-
+-ifneq (,$(SRCDIR))
+-SRCDIR_CSHARPSRCS = $(addprefix $(SRCDIR),$(CSHARPSRCS))
+-else
+-SRCDIR_CSHARPSRCS =
+-endif
+-
+-csharp_compile: $(SRCDIR_SRCS)
+-	$(COMPILETOOL) $(CSHARPCOMPILER) $(CSHARPFLAGS) $(CSHARPOPTIONS) $(CSHARPSRCS) $(SRCDIR_CSHARPSRCS)
+-
+-# -----------------------------------------------------------------
+-# Run CSharp example
+-# -----------------------------------------------------------------
+-
+-csharp_run:
+-	env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) $(CSHARPCILINTERPRETER) $(CSHARPCILINTERPRETER_FLAGS) $(CSHARP_RUNME) $(RUNPIPE)
+-
+-# -----------------------------------------------------------------
+-# Version display
+-# -----------------------------------------------------------------
+-
+-# Version check below also works with MS csc.exe which does not understand --version
+-csharp_version:
+-	$(CSHARPCOMPILER) --version | head -n 1
+-	if test -n "$(CSHARPCILINTERPRETER)" ; then "$(CSHARPCILINTERPRETER)" --version ; fi
+-
+-# -----------------------------------------------------------------
+-# Cleaning the CSharp examples
+-# -----------------------------------------------------------------
+-
+-csharp_clean:
+-	rm -f *_wrap* *~ .~* $(RUNME) $(RUNME).exe *.exe.mdb gc.log `find . -name \*.cs | grep -v $(RUNME).cs`
+-	rm -f core @EXTRA_CLEAN@
+-	rm -f *.@OBJEXT@ *@CSHARPSO@
+-
+-##################################################################
+ #####                      LUA                              ######
+ ##################################################################
+ 
+diff --git a/Examples/index.html b/Examples/index.html
+index 66885b6..a45214f 100644
+--- a/Examples/index.html
+++ b/Examples/index.html
+@@ -39,7 +39,6 @@ language:
+ <li><a href="perl5/index.html">Perl5</a>
+ <li><a href="tcl/index.html">Tcl</a>
+ <li><a href="guile/">Guile</a>
+-<li><a href="java/index.html">Java</a>
+ <li><a href="mzscheme">Mzscheme</a>
+ <li><a href="ruby/index.html">Ruby</a>
+ </ul>
+diff --git a/Makefile.in b/Makefile.in
+index 39816be..61dbf88 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -62,14 +62,12 @@ docs-main:
+ skip-tcl	= test -n "@SKIP_TCL@"
+ skip-perl5	= test -n "@SKIP_PERL5@"
+ skip-python	= test -n "@SKIP_PYTHON@"
+-skip-java	= test -n "@SKIP_JAVA@"
+ skip-guile	= test -n "@SKIP_GUILE@"
+ skip-mzscheme	= test -n "@SKIP_MZSCHEME@"
+ skip-ruby	= test -n "@SKIP_RUBY@"
+ skip-php	= test -n "@SKIP_PHP@"
+ skip-ocaml      = test -n "@SKIP_OCAML@"
+ skip-octave     = test -n "@SKIP_OCTAVE@"
+-skip-csharp	= test -n "@SKIP_CSHARP@"
+ skip-lua    	= test -n "@SKIP_LUA@"
+ skip-r		= test -n "@SKIP_R@"
+ skip-scilab     = test -n "@SKIP_SCILAB@"
+@@ -77,9 +75,6 @@ skip-go		= test -n "@SKIP_GO@"
+ skip-d		= test -n "@SKIP_D@"
+ skip-javascript	= test -n "@SKIP_JAVASCRIPT@"
+ 
+-# Additional dependencies for some tests
+-skip-android    = test -n "@SKIP_ANDROID@"
+-
+ # Special errors test-case
+ skip-errors	= test -n ""
+ 
+@@ -103,14 +98,12 @@ check-aliveness:
+ 	@$(skip-tcl)      || ./$(TARGET) -tcl        -help
+ 	@$(skip-perl5)    || ./$(TARGET) -perl       -help
+ 	@$(skip-python)   || ./$(TARGET) -python     -help
+-	@$(skip-java)     || ./$(TARGET) -java       -help
+ 	@$(skip-guile)    || ./$(TARGET) -guile      -help
+ 	@$(skip-mzscheme) || ./$(TARGET) -mzscheme   -help
+ 	@$(skip-ruby)     || ./$(TARGET) -ruby       -help
+ 	@$(skip-ocaml)    || ./$(TARGET) -ocaml      -help
+ 	@$(skip-octave)   || ./$(TARGET) -octave     -help
+ 	@$(skip-php)      || ./$(TARGET) -php7       -help
+-	@$(skip-csharp)   || ./$(TARGET) -csharp     -help
+ 	@$(skip-lua)      || ./$(TARGET) -lua        -help
+ 	@$(skip-r) 	  || ./$(TARGET) -r          -help
+ 	@$(skip-scilab)   || ./$(TARGET) -scilab     -help
+@@ -126,16 +119,13 @@ check-versions:					\
+ 	check-tcl-version			\
+ 	check-perl5-version			\
+ 	check-python-version			\
+-	check-java-version			\
+ 	check-javascript-version			\
+-	check-android-version			\
+ 	check-guile-version			\
+ 	check-mzscheme-version			\
+ 	check-ruby-version			\
+ 	check-ocaml-version			\
+ 	check-octave-version			\
+ 	check-php-version			\
+-	check-csharp-version			\
+ 	check-lua-version			\
+ 	check-r-version				\
+ 	check-scilab-version			\
+@@ -160,15 +150,12 @@ check-examples:					\
+ 	check-tcl-examples			\
+ 	check-perl5-examples			\
+ 	check-python-examples			\
+-	check-java-examples			\
+-	check-android-examples			\
+ 	check-guile-examples			\
+ 	check-mzscheme-examples			\
+ 	check-ruby-examples			\
+ 	check-ocaml-examples			\
+ 	check-octave-examples			\
+ 	check-php-examples			\
+-	check-csharp-examples                   \
+ 	check-lua-examples			\
+ 	check-r-examples			\
+ 	check-scilab-examples			\
+@@ -179,15 +166,12 @@ check-examples:					\
+ tcl_examples       :=$(shell sed '/^\#/d' $(srcdir)/Examples/tcl/check.list)
+ perl5_examples     :=$(shell sed '/^\#/d' $(srcdir)/Examples/perl5/check.list)
+ python_examples    :=$(shell sed '/^\#/d' $(srcdir)/Examples/python/check.list)
+-java_examples      :=$(shell sed '/^\#/d' $(srcdir)/Examples/java/check.list)
+-android_examples   :=$(shell sed '/^\#/d' $(srcdir)/Examples/android/check.list)
+ guile_examples     :=$(shell sed '/^\#/d' $(srcdir)/Examples/guile/check.list)
+ mzscheme_examples  :=$(shell sed '/^\#/d' $(srcdir)/Examples/mzscheme/check.list)
+ ruby_examples      :=$(shell sed '/^\#/d' $(srcdir)/Examples/ruby/check.list)
+ ocaml_examples     :=$(shell sed '/^\#/d' $(srcdir)/Examples/ocaml/check.list)
+ octave_examples    :=$(shell sed '/^\#/d' $(srcdir)/Examples/octave/check.list)
+ php_examples       :=$(shell sed '/^\#/d' $(srcdir)/Examples/php/check.list)
+-csharp_examples    :=$(shell sed '/^\#/d' $(srcdir)/Examples/csharp/check.list)
+ lua_examples       :=$(shell sed '/^\#/d' $(srcdir)/Examples/lua/check.list)
+ r_examples         :=$(shell sed '/^\#/d' $(srcdir)/Examples/r/check.list)
+ scilab_examples    :=$(shell sed '/^\#/d' $(srcdir)/Examples/scilab/check.list)
+@@ -221,14 +205,12 @@ check-test-suite:				\
+ 	check-tcl-test-suite			\
+ 	check-perl5-test-suite			\
+ 	check-python-test-suite			\
+-	check-java-test-suite			\
+ 	check-guile-test-suite			\
+ 	check-mzscheme-test-suite		\
+ 	check-ruby-test-suite			\
+ 	check-ocaml-test-suite			\
+ 	check-octave-test-suite			\
+ 	check-php-test-suite			\
+-	check-csharp-test-suite			\
+ 	check-lua-test-suite			\
+ 	check-r-test-suite			\
+ 	check-scilab-test-suite			\
+@@ -268,14 +250,12 @@ all-test-suite:					\
+ 	all-tcl-test-suite			\
+ 	all-perl5-test-suite			\
+ 	all-python-test-suite			\
+-	all-java-test-suite			\
+ 	all-guile-test-suite			\
+ 	all-mzscheme-test-suite			\
+ 	all-ruby-test-suite			\
+ 	all-ocaml-test-suite			\
+ 	all-octave-test-suite			\
+ 	all-php-test-suite			\
+-	all-csharp-test-suite			\
+ 	all-lua-test-suite			\
+ 	all-r-test-suite			\
+ 	all-scilab-test-suite   		\
+@@ -291,14 +271,12 @@ broken-test-suite:				\
+ 	broken-tcl-test-suite			\
+ 	broken-perl5-test-suite			\
+ 	broken-python-test-suite		\
+-	broken-java-test-suite			\
+ 	broken-guile-test-suite			\
+ 	broken-mzscheme-test-suite		\
+ 	broken-ruby-test-suite			\
+ 	broken-ocaml-test-suite			\
+ 	broken-octave-test-suite		\
+ 	broken-php-test-suite			\
+-	broken-csharp-test-suite		\
+ 	broken-lua-test-suite			\
+ 	broken-r-test-suite			\
+ 	broken-scilab-test-suite           	\
+@@ -435,8 +413,8 @@ install-main:
+ 	@echo "Installing $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@"
+ 	@$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@
+ 
+-lib-languages = typemaps tcl perl5 python guile java mzscheme ruby php ocaml octave \
+-	csharp lua r go d javascript javascript/jsc \
+lib-languages = typemaps tcl perl5 python guile mzscheme ruby php ocaml octave \
+	lua r go d javascript javascript/jsc \
+ 	javascript/v8 scilab xml
+ 
+ lib-modules = std
+diff --git a/Source/Makefile.am b/Source/Makefile.am
+index 5cfb888..a15f06c 100644
+--- a/Source/Makefile.am
+++ b/Source/Makefile.am
+@@ -41,21 +41,17 @@ eswig_SOURCES =	CParse/cscanner.c		\
+ 		Doxygen/doxyparser.h		\
+ 		Doxygen/doxytranslator.cxx	\
+ 		Doxygen/doxytranslator.h	\
+-		Doxygen/javadoc.cxx		\
+-		Doxygen/javadoc.h		\
+ 		Doxygen/pydoc.cxx		\
+ 		Doxygen/pydoc.h			\
+ 		Modules/allocate.cxx		\
+ 		Modules/browser.cxx		\
+ 		Modules/contract.cxx		\
+-		Modules/csharp.cxx		\
+ 		Modules/d.cxx			\
+ 		Modules/directors.cxx		\
+ 		Modules/emit.cxx		\
+ 		Modules/go.cxx			\
+ 		Modules/guile.cxx		\
+ 		Modules/interface.cxx		\
+-		Modules/java.cxx		\
+ 		Modules/javascript.cxx		\
+ 		Modules/lang.cxx		\
+ 		Modules/lua.cxx			\
+diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx
+index 84ac742..3f6fc8d 100644
+--- a/Source/Modules/swigmain.cxx
+++ b/Source/Modules/swigmain.cxx
+@@ -26,11 +26,9 @@
+    can be dynamically loaded in future versions. */
+ 
+ extern "C" {
+-  Language *swig_csharp(void);
+   Language *swig_d(void);
+   Language *swig_go(void);
+   Language *swig_guile(void);
+-  Language *swig_java(void);
+   Language *swig_javascript(void);
+   Language *swig_lua(void);
+   Language *swig_mzscheme(void);
+@@ -55,11 +53,9 @@ static TargetLanguageModule modules[] = {
+   {"-chicken", NULL, "CHICKEN", Disabled},
+   {"-clisp", NULL, "CLISP", Disabled},
+   {"-cffi", NULL, "CFFI", Disabled},
+-  {"-csharp", swig_csharp, "C#", Supported},
+   {"-d", swig_d, "D", Supported},
+   {"-go", swig_go, "Go", Supported},
+   {"-guile", swig_guile, "Guile", Supported},
+-  {"-java", swig_java, "Java", Supported},
+   {"-javascript", swig_javascript, "Javascript", Supported},
+   {"-lua", swig_lua, "Lua", Supported},
+   {"-modula3", NULL, "Modula 3", Disabled},
+diff --git a/configure.ac b/configure.ac
+index 22e3672..a4f0216 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1264,276 +1264,6 @@ AC_SUBST(SCILAB)
+ AC_SUBST(SCILABINCLUDE)
+ AC_SUBST(SCILABOPT)
+ 
+-
+-#----------------------------------------------------------------
+-# Look for java
+-#----------------------------------------------------------------
+-
+-AC_ARG_WITH(java, AS_HELP_STRING([--without-java], [Disable Java])
+-AS_HELP_STRING([--with-java=path], [Set location of java executable]),[JAVABIN="$withval"], [JAVABIN="$alllang_default"])
+-AC_ARG_WITH(javac, [  --with-javac=path       Set location of javac executable],[JAVACBIN="$withval"], [JAVACBIN=])
+-
+-# First, check for "--without-java" or "--with-java=no".
+-if test x"${JAVABIN}" = xno; then
+-AC_MSG_NOTICE([Disabling Java])
+-JAVA=
+-else
+-
+-dnl Detect everything we need for Java: java for running Java tests, javac for
+-dnl compiling them and C headers for compiling C code.
+-dnl
+-dnl If JAVA_HOME is defined and contains everything needed, as it's supposed to,
+-dnl just use it. Otherwise try to locate the necessary files in the path.
+-case $host in
+-  *-*-cygwin*)
+-    dnl Ensure that JAVA_HOME is in the form we can use, it's typically set to Windows path by the installer.
+-    if test -n "$JAVA_HOME"; then
+-      JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
+-    fi
+-    dnl Java uses semicolons and not colons as separators in its classes search path under Windows.
+-    JAVA_CLASSPATH_SEP=";"
+-    ;;
+-  *-*-mingw*)
+-    if test -n "$JAVA_HOME"; then
+-      JAVA_HOME=`${srcdir}/Tools/convertpath -u "$JAVA_HOME"`
+-    fi
+-    JAVA_CLASSPATH_SEP=";"
+-    ;;
+-  *-*-darwin*)
+-    dnl Under OS X JAVA_HOME is not set by default, try to use the system default JRE.
+-    if test -z "$JAVA_HOME" -a -x /usr/libexec/java_home; then
+-      JAVA_HOME=`/usr/libexec/java_home`
+-    fi
+-    dnl The JAVA_HOME doesn't contain the JDK headers though, but they seem to
+-    dnl always be in the same location, according to Apple JNI documentation.
+-    JAVA_OSX_STD_INCDIR="/System/Library/Frameworks/JavaVM.framework/Headers"
+-    if test -r "$JAVA_OSX_STD_INCDIR/jni.h"; then
+-      JAVA_HOME_INCDIR=$JAVA_OSX_STD_INCDIR
+-    fi
+-    JAVA_CLASSPATH_SEP=":"
+-    ;;
+-  *)
+-    dnl Assume generic Unix.
+-    JAVA_CLASSPATH_SEP=":"
+-    ;;
+-esac
+-
+-AC_MSG_CHECKING(for java JDK)
+-if test -n "$JAVA_HOME"; then
+-  dnl Don't complain about missing executables/headers if they had been
+-  dnl explicitly overridden from the command line, but otherwise verify that we
+-  dnl have everything we need.
+-  java_home_ok=1
+-  if test -z "$JAVABIN" -a ! -x "$JAVA_HOME/bin/java"; then
+-    AC_MSG_WARN([No java executable under JAVA_HOME.])
+-    java_home_ok=0
+-  fi
+-  if test -z "$JAVACBIN" -a ! -x "$JAVA_HOME/bin/javac"; then
+-    AC_MSG_WARN([No javac executable under JAVA_HOME.])
+-    java_home_ok=0
+-  fi
+-
+-  dnl By default the headers are under JAVA_HOME/include, but OS X is special
+-  dnl and defines JAVA_HOME_INCDIR differently above.
+-  if test -z "$JAVA_HOME_INCDIR"; then
+-    JAVA_HOME_INCDIR="$JAVA_HOME/include"
+-  fi
+-  if test -z "$JAVAINCDIR" -a ! -r "$JAVA_HOME_INCDIR/jni.h"; then
+-    AC_MSG_WARN([No java headers under JAVA_HOME (does it point to a JDK and not just JRE?).])
+-    java_home_ok=0
+-  fi
+-  if test "$java_home_ok" = 1; then
+-    AC_MSG_RESULT([found (in $JAVA_HOME)])
+-  else
+-    AC_MSG_RESULT(no)
+-    AC_MSG_WARN([JAVA_HOME ($JAVA_HOME) is defined but does not point to a complete JDK installation, ignoring it.])
+-    JAVA_HOME=
+-  fi
+-else
+-  AC_MSG_RESULT([no (JAVA_HOME is not defined)])
+-fi
+-
+-if test "x$JAVABIN" = xyes; then
+-  if test -n "$JAVA_HOME"; then
+-    JAVA="$JAVA_HOME/bin/java"
+-  else
+-    AC_CHECK_PROGS(JAVA, java kaffe guavac)
+-  fi
+-else
+-  JAVA="$JAVABIN"
+-fi
+-
+-if test -z "$JAVACBIN"; then
+-  if test -n "$JAVA_HOME"; then
+-    JAVAC="$JAVA_HOME/bin/javac"
+-  else
+-    AC_CHECK_PROGS(JAVAC, javac)
+-  fi
+-else
+-  JAVAC="$JAVACBIN"
+-fi
+-
+-# Check Java version: we require Java 9 or later for Doxygen tests.
+-if test -n "$JAVAC"; then
+-    AC_MSG_CHECKING(if java version is 9 or greater)
+-    javac_version=`"$JAVAC" -version 2>&1`
+-    java_version_num=`echo $javac_version | sed -n 's/^javac //p'`
+-    if test -z "$java_version_num"; then
+-        AC_MSG_WARN([unknown format for Java version returned by "$JAVAC" ($javac_version)])
+-        JAVA_SKIP_DOXYGEN_TEST_CASES=1
+-        AC_MSG_RESULT(unknown)
+-    else
+-        dnl Until Java 8 version number was in format "1.x", starting from
+-        dnl Java 9 it's just "x".
+-        case $java_version_num in
+-            1.*)
+-                JAVA_SKIP_DOXYGEN_TEST_CASES=1
+-                AC_MSG_RESULT([no, disabling Doxygen tests])
+-                ;;
+-
+-            *)
+-                AC_MSG_RESULT(yes)
+-                ;;
+-        esac
+-    fi
+-
+-    AC_SUBST(JAVA_SKIP_DOXYGEN_TEST_CASES)
+-fi
+-
+-AC_MSG_CHECKING(for java include file jni.h)
+-AC_ARG_WITH(javaincl, [  --with-javaincl=path    Set location of Java include directory], [JAVAINCDIR="$withval"], [JAVAINCDIR=])
+-
+-JAVAINC=""
+-if test -z "$JAVAINCDIR" ; then
+-  if test -n "$JAVA_HOME"; then
+-    JAVAINCDIR="$JAVA_HOME_INCDIR"
+-    JAVAINC=-I\"$JAVAINCDIR\"
+-  else
+-    JAVAINCDIR="/usr/j2sdk*/include /usr/local/j2sdk*/include /usr/jdk*/include /usr/local/jdk*/include /opt/j2sdk*/include /opt/jdk*/include /usr/java/include /usr/java/j2sdk*/include /usr/java/jdk*/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/lib/java/include /usr/lib/jvm/java*/include /usr/lib64/jvm/java*/include /usr/include/kaffe /usr/local/include/kaffe /usr/include"
+-
+-    # Add in default installation directory on Windows for Cygwin
+-    case $host in
+-    *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files*/Java/jdk*/include d:/Program*Files*/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
+-    *-*-darwin*) JAVAINCDIR="$JAVA_OSX_STD_INCDIR $JAVAINCDIR";;
+-    *);;
+-    esac
+-
+-    for d in $JAVAINCDIR ; do
+-      if test -r "$d/jni.h" ; then
+-	JAVAINCDIR=$d
+-	JAVAINC=-I\"$d\"
+-	JAVA_HOME_MAYBE="`dirname $d`"
+-	break
+-      fi
+-    done
+-  fi
+-else
+-  if test -r "$JAVAINCDIR/jni.h" ; then
+-    JAVAINC=-I\"$JAVAINCDIR\"
+-  fi
+-fi
+-
+-if test "$JAVAINC" = "" ; then
+-  AC_MSG_RESULT(not found)
+-else
+-  AC_MSG_RESULT($JAVAINC)
+-  # now look for <arch>/jni_md.h
+-  AC_MSG_CHECKING(for java include file jni_md.h)
+-  JAVAMDDIR=`find "$JAVAINCDIR" -follow -name jni_md.h -print`
+-  if test "$JAVAMDDIR" = "" ; then
+-    AC_MSG_RESULT(not found)
+-  else
+-    JAVAMDDIR=-I\"`dirname "$JAVAMDDIR" | tail -1`\"
+-    AC_MSG_RESULT($JAVAMDDIR)
+-    JAVAINC="${JAVAINC} ${JAVAMDDIR}"
+-  fi
+-fi
+-
+-# Auto-detecting JAVA_HOME is not so easy, below will only work up to and including jdk8
+-if test -z "$JAVA_HOME" && test -n "$JAVA_HOME_MAYBE" ; then
+-  AC_MSG_CHECKING(for java jdk from jni include paths)
+-  if test -r "$JAVA_HOME_MAYBE/lib/tools.jar" ; then
+-    JAVA_HOME=$JAVA_HOME_MAYBE
+-    AC_MSG_RESULT([$JAVA_HOME])
+-  else
+-    AC_MSG_RESULT(not found)
+-  fi
+-fi
+-
+-case $host in
+-*-*-cygwin*)
+-        # TODO: Only use this flag if the compiler supports it, later versions of gcc no longer have it
+-        GCC_MNO_CYGWIN=" -mno-cygwin"
+-        ;;
+-*)
+-        GCC_MNO_CYGWIN=""
+-        ;;
+-esac
+-
+-# java.exe on Cygwin requires the Windows standard (Pascal) calling convention as it is a normal Windows executable and not a Cygwin built executable
+-case $host in
+-*-*-cygwin* | *-*-mingw*)
+-    if test "$GCC" = yes; then
+-        JAVADYNAMICLINKING="$GCC_MNO_CYGWIN -mthreads -Wl,--add-stdcall-alias"
+-        JAVACFLAGS="$GCC_MNO_CYGWIN -mthreads"
+-    else
+-        JAVADYNAMICLINKING=""
+-        JAVACFLAGS=""
+-    fi ;;
+-*-*-darwin*)
+-        JAVADYNAMICLINKING="-dynamiclib -framework JavaVM"
+-        JAVACFLAGS=""
+-        ;;
+-*)
+-        JAVADYNAMICLINKING=""
+-        JAVACFLAGS=""
+-        ;;
+-esac
+-
+-# Java on Windows platforms including Cygwin doesn't use libname.dll, rather name.dll when loading dlls
+-case $host in
+-*-*-cygwin* | *-*-mingw*) JAVALIBRARYPREFIX="";;
+-*)JAVALIBRARYPREFIX="lib";;
+-esac
+-
+-# Java on Mac OS X tweaks
+-case $host in
+-*-*-darwin*)
+-    JAVASO=".jnilib"
+-    JAVALDSHARED='$(CC)'
+-    JAVACXXSHARED='$(CXX)'
+-    ;;
+-*)
+-    JAVASO=$SO
+-    JAVALDSHARED='$(LDSHARED)'
+-    JAVACXXSHARED='$(CXXSHARED)'
+-    ;;
+-esac
+-fi
+-
+-# Quote for spaces in path to executables
+-if test -n "$JAVA"; then
+-  JAVA=\"$JAVA\"
+-fi
+-if test -n "$JAVAC"; then
+-  JAVAC=\"$JAVAC\"
+-fi
+-
+-# Turned off due to spurious warnings in later versions of openjdk-1.8
+-# JAVAFLAGS=-Xcheck:jni
+-
+-AC_SUBST(JAVA)
+-AC_SUBST(JAVAC)
+-AC_SUBST(JAVAINC)
+-AC_SUBST(JAVA_CLASSPATH_SEP)
+-AC_SUBST(JAVADYNAMICLINKING)
+-AC_SUBST(JAVALIBRARYPREFIX)
+-AC_SUBST(JAVASO)
+-AC_SUBST(JAVALDSHARED)
+-AC_SUBST(JAVACXXSHARED)
+-AC_SUBST(JAVAFLAGS)
+-AC_SUBST(JAVACFLAGS)
+-
+ #----------------------------------------------------------------
+ # Look for Javascript
+ #----------------------------------------------------------------
+@@ -1726,51 +1456,6 @@ AC_SUBST(NODEJS)
+ AC_SUBST(NODEGYP)
+ 
+ #----------------------------------------------------------------
+-# Look for Android
+-#----------------------------------------------------------------
+-
+-AC_ARG_WITH(android, AS_HELP_STRING([--without-android], [Disable Android])
+-AS_HELP_STRING([--with-android=path], [Set location of android executable]),[ANDROIDBIN="$withval"], [ANDROIDBIN="$alllang_default"])
+-AC_ARG_WITH(adb, [  --with-adb=path         Set location of adb executable - Android Debug Bridge],[ADBBIN="$withval"], [ADBBIN=])
+-AC_ARG_WITH(ant, [  --with-ant=path         Set location of ant executable for Android],[ANTBIN="$withval"], [ANTBIN=])
+-AC_ARG_WITH(ndk-build, [  --with-ndk-build=path   Set location of Android ndk-build executable],[NDKBUILDBIN="$withval"], [NDKBUILDBIN=])
+-
+-# First, check for "--without-android" or "--with-android=no".
+-if test x"${ANDROIDBIN}" = xno; then
+-  AC_MSG_NOTICE([Disabling Android])
+-  ANDROID=
+-else
+-  if test "x$ANDROIDBIN" = xyes; then
+-    AC_CHECK_PROGS(ANDROID, android)
+-  else
+-    ANDROID="$ANDROIDBIN"
+-  fi
+-
+-  if test -z "$ADBBIN"; then
+-    AC_CHECK_PROGS(ADB, adb)
+-  else
+-    ADB="$ADBBIN"
+-  fi
+-
+-  if test -z "$ANTBIN"; then
+-    AC_CHECK_PROGS(ANT, ant)
+-  else
+-    ANT="$ANTBIN"
+-  fi
+-
+-  if test -z "$NDKBUILDBIN"; then
+-    AC_CHECK_PROGS(NDKBUILD, ndk-build)
+-  else
+-    NDKBUILD="$NDKBUILDBIN"
+-  fi
+-fi
+-
+-AC_SUBST(ANDROID)
+-AC_SUBST(ADB)
+-AC_SUBST(ANT)
+-AC_SUBST(NDKBUILD)
+-
+-#----------------------------------------------------------------
+ # Look for Guile
+ #----------------------------------------------------------------
+ 
+@@ -2132,119 +1817,6 @@ AC_SUBST(OCAMLFIND)
+ AC_SUBST(OCAMLMKTOP)
+ 
+ #----------------------------------------------------------------
+-# Look for C#
+-#----------------------------------------------------------------
+-
+-AC_ARG_WITH(csharp, AS_HELP_STRING([--without-csharp], [Disable CSharp]), [with_csharp="$withval"], [with_csharp="$alllang_default"])
+-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=])
+-
+-# First, check for "--without-csharp" or "--with-csharp=no".
+-if test x"${with_csharp}" = xno; then
+-AC_MSG_NOTICE([Disabling CSharp])
+-CSHARPCOMPILER=
+-else
+-
+-if test -z "$CSHARPCOMPILERBIN" ; then
+-  case $host in
+-  *-*-cygwin* | *-*-mingw*)
+-    # prefer unified Mono mcs compiler (not to be confused with the ancient .NET 1 mcs) over older/alternative names.
+-    AC_CHECK_PROGS(CSHARPCOMPILER, csc mcs mono-csc gmcs cscc)
+-    if test -n "$CSHARPCOMPILER" && test "$CSHARPCOMPILER" = "csc" ; then
+-      AC_MSG_CHECKING(whether csc is the Microsoft CSharp compiler)
+-      csc 2>/dev/null | grep "C#" > /dev/null || CSHARPCOMPILER=""
+-      if test -z "$CSHARPCOMPILER" ; then
+-        AC_MSG_RESULT(no)
+-        AC_CHECK_PROGS(CSHARPCOMPILER, mcs mono-csc gmcs cscc)
+-      else
+-        AC_MSG_RESULT(yes)
+-      fi
+-    fi
+-    ;;
+-  *)AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc);;
+-  esac
+-else
+-  CSHARPCOMPILER="$CSHARPCOMPILERBIN"
+-fi
+-
+-CSHARPCONVERTPATH="Tools/convertpath -u"
+-if test -z "$CSHARPBIN" ; then
+-  CSHARPCILINTERPRETER=""
+-  CSHARPCILINTERPRETER_FLAGS=""
+-  if test "cscc" = "$CSHARPCOMPILER" ; then
+-    AC_CHECK_PROGS(CSHARPCILINTERPRETER, ilrun)
+-  else
+-    if test "mcs" = "$CSHARPCOMPILER"; then
+-      # Check that mcs is the C# compiler and not the Unix mcs utility by examining the output of 'mcs --version'
+-      # The Mono compiler should emit: Mono C# compiler version a.b.c.d
+-      csharp_version_raw=`(mcs --version) 2>/dev/null`
+-      csharp_version_searched=`(mcs --version | sed -e "/C#/b" -e "/Mono/b" -e d) 2>/dev/null` # return string if contains 'Mono' or 'C#'
+-      CSHARPCOMPILER=""
+-      if test -n "$csharp_version_raw" ; then
+-        if test "$csharp_version_raw" = "$csharp_version_searched" ; then
+-          CSHARPCOMPILER="mcs"
+-        fi
+-      fi
+-      if test "mcs" != "$CSHARPCOMPILER" ; then
+-        echo "mcs is not a working Mono C# compiler"
+-      fi
+-    fi
+-    if test "mcs" = "$CSHARPCOMPILER" || test "gmcs" = "$CSHARPCOMPILER" || test "mono-csc" = "$CSHARPCOMPILER"; then
+-        AC_CHECK_PROGS(CSHARPCILINTERPRETER, mono) # Mono JIT
+-        CSHARPCILINTERPRETER_FLAGS="--debug"
+-    else
+-      if test "csc" = "$CSHARPCOMPILER"; then
+-          CSHARPCONVERTPATH="Tools/convertpath -w"
+-      fi
+-    fi
+-  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
+-case $host in
+-*-*-cygwin* | *-*-mingw*)
+-    if test "$GCC" = yes; then
+-        CSHARPDYNAMICLINKING="$GCC_MNO_CYGWIN -mthreads -Wl,--add-stdcall-alias"
+-        CSHARPCFLAGS="$GCC_MNO_CYGWIN -mthreads"
+-    else
+-        CSHARPDYNAMICLINKING=""
+-        CSHARPCFLAGS=""
+-    fi ;;
+-*)
+-        CSHARPDYNAMICLINKING=""
+-        CSHARPCFLAGS=""
+-        ;;
+-esac
+-
+-# CSharp on Windows platforms including Cygwin doesn't use libname.dll, rather name.dll when loading dlls
+-case $host in
+-*-*-cygwin* | *-*-mingw*) CSHARPLIBRARYPREFIX="";;
+-*)CSHARPLIBRARYPREFIX="lib";;
+-esac
+-
+-# C#/Mono on Mac OS X tweaks
+-case $host in
+-*-*-darwin*)
+-    CSHARPSO=".so"
+-    ;;
+-*)
+-    CSHARPSO=$SO
+-    ;;
+-esac
+-fi
+-
+-AC_SUBST(CSHARPCILINTERPRETER_FLAGS)
+-AC_SUBST(CSHARPCILINTERPRETER)
+-AC_SUBST(CSHARPCONVERTPATH)
+-AC_SUBST(CSHARPCOMPILER)
+-AC_SUBST(CSHARPDYNAMICLINKING)
+-AC_SUBST(CSHARPLIBRARYPREFIX)
+-AC_SUBST(CSHARPCFLAGS)
+-AC_SUBST(CSHARPSO)
+-
+-#----------------------------------------------------------------
+ # Look for Lua
+ #----------------------------------------------------------------
+ 
+@@ -2665,16 +2237,6 @@ fi
+ AC_SUBST(SKIP_OCAML)
+ 
+ 
+-SKIP_CSHARP=
+-if test -z "$CSHARPCOMPILER" ; then
+-    SKIP_CSHARP="1"
+-else
+-    if test "cscc" = "$CSHARPCOMPILER" && test -z "$CSHARPCILINTERPRETER" ; then
+-      SKIP_CSHARP="1"
+-    fi
+-fi
+-AC_SUBST(SKIP_CSHARP)
+-
+ SKIP_LUA=
+ # we need LUABIN & dynamic loading
+ if test -z "$LUABIN" || test -z "$LUADYNAMICLOADLIB"; then
+@@ -2707,18 +2269,6 @@ fi
+ AC_SUBST(SKIP_D)
+ 
+ #----------------------------------------------------------------
+-# Additional language dependencies
+-#----------------------------------------------------------------
+-
+-SKIP_ANDROID=
+-if test -z "$ANDROID" || test -z "$ADB" || test -z "$ANT" || test -z "$NDKBUILD" ; then
+-    SKIP_ANDROID="1"
+-fi
+-AC_SUBST(SKIP_ANDROID)
+-
+-
+-
+-#----------------------------------------------------------------
+ # Miscellaneous
+ #----------------------------------------------------------------
+ 
+@@ -2795,10 +2345,8 @@ AC_CONFIG_FILES([
+     Examples/d/example.mk
+     Examples/xml/Makefile
+     Examples/test-suite/errors/Makefile
+-    Examples/test-suite/csharp/Makefile
+     Examples/test-suite/d/Makefile
+     Examples/test-suite/guile/Makefile
+-    Examples/test-suite/java/Makefile
+     Examples/test-suite/javascript/Makefile
+     Examples/test-suite/mzscheme/Makefile
+     Examples/test-suite/ocaml/Makefile
+@@ -2857,11 +2405,9 @@ EOF
+ AC_OUTPUT
+ 
+ langs=""
+-test -n "$SKIP_CSHARP"		|| langs="${langs}csharp "
+ test -n "$SKIP_D"		|| langs="${langs}d "
+ test -n "$SKIP_GO"		|| langs="${langs}go "
+ test -n "$SKIP_GUILE"		|| langs="${langs}guile "
+-test -n "$SKIP_JAVA"		|| langs="${langs}java "
+ test -n "$SKIP_JAVASCRIPT"	|| langs="${langs}javascript "
+ test -n "$SKIP_LUA"		|| langs="${langs}lua "
+ test -n "$SKIP_MZSCHEME"	|| langs="${langs}mzscheme "