--- Amaya/configure.in	1997/06/20 12:09:18	1.9
+++ Amaya/configure.in	1997/06/30 16:08:07	1.10
@@ -1,7 +1,7 @@
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl Autoconf script for Amaya and Thot.
-dnl Daniel Veillard, 1997
+dnl Daniel Veillard and Irene Vatton, 1997
 dnl
 
 dnl  ***************************************************************
@@ -404,12 +404,12 @@ dnl
 
 AC_ARG_ENABLE(java, [  --enable-java           Add Kaffe Java virtual machine])
 AC_ARG_ENABLE(intr, [  --enable-intr           Use Kaffe Java Interpreter])
-AC_ARG_ENABLE(jit, [  --enable-jit            Use Kaffe Java JIT Compiler])
-AC_ARG_ENABLE(plugin, [  --enable-plugin         Add Netscape Plug-Ins support])
-AC_ARG_ENABLE(xml, [  --enable-xml            Add XML support ])
+AC_ARG_ENABLE(jit, [  --enable-jit             Use Kaffe Java JIT Compiler])
+AC_ARG_ENABLE(plugin, [  --enable-plugin       Add Netscape Plug-Ins support])
+AC_ARG_ENABLE(math, [  --enable-math             Add Math support ])
 
 dnl
-dnl Check for the Kaffe engine to use : interpreter of JIT
+dnl Check for the Kaffe engine to use : interpreter or JIT
 dnl
 if test "$enable_intr" = "yes" ; then
     with_java="yes"
@@ -439,21 +439,29 @@ else
 fi
 
 dnl
-dnl plugins are disabled by default
+dnl plugins are disabled by default if using java else enabled by default
 dnl
-if test "$enable_plugin" = "yes" ; then
+if test "$with_java" = "yes" ; then
+  if test "$enable_plugin" = "yes" ; then
     with_plugin="yes"
+  else
+    with_plugin="no"
+  fi
 else
+  if test "$enable_plugin" = "no" ; then
     with_plugin="no"
-fi
+  else
+    with_plugin="yes"
+  fi
+fi  
 
 dnl
-dnl xml is disabled by default
+dnl math is enabled by default
 dnl
-if test "$enable_xml" = "yes" ; then
-    with_xml="yes"
+if test "$enable_math" = "no" ; then
+    with_math="no"
 else
-    with_xml="no"
+    with_math="yes"
 fi
 
 if test "$build_amaya" = "yes" ; then 
@@ -480,11 +488,11 @@ if test "$build_amaya" = "yes" ; then
     fi
 
     if test ! -f $srcdir/amaya/MathML.S ; then
-	if test "$with_xml" = "yes" ; then
+	if test "$with_math" = "yes" ; then
 	    AC_MSG_WARN(MathML sources not found !!)
-	    AC_MSG_WARN(Disabling XML build !)
-	    with_xml="no"
-	    XML_OPTIONS=
+	    AC_MSG_WARN(Disabling MATH build !)
+	    with_math="no"
+	    MATH_OPTIONS=
 	fi
     fi
 fi
@@ -494,7 +502,7 @@ dnl The options for each library or bina
 dnl
 
 THOT_OPTIONS=
-AMAYA_OPTIONS="-DCOUGAR" $XML_OPTIONS
+AMAYA_OPTIONS="-DCOUGAR" $MATH_OPTIONS
 PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
 dnl JAVA_OPTIONS="-DDEBUG_KAFFE -DDEBUG_LOCK -DDEBUG_SELECT -DDEBUG_SELECT_CHANNELS -DDEBUG_TIMING -DSYNC_DNS"
 JAVA_OPTIONS=
@@ -574,12 +582,12 @@ else
     www_frag=$srcdir/amaya/Makefile.libwww
 fi
 
-if test "$with_xml" = "yes" ; then
-    AC_SUBST_FILE(xml_frag)
-    xml_frag=$srcdir/amaya/Makefile.xml
+if test "$with_math" = "yes" ; then
+    AC_SUBST_FILE(math_frag)
+    math_frag=$srcdir/amaya/Makefile.math
 else
-    AC_SUBST_FILE(xml_frag)
-    xml_frag=/dev/null
+    AC_SUBST_FILE(math_frag)
+    math_frag=/dev/null
 fi
 
 dnl  ***************************************************************
@@ -727,8 +735,8 @@ if test "$build_amaya" = "yes" ; then
 	    echo Amaya configured with Plugins support
 	fi
     fi
-    if test "$with_xml" = "yes" ; then
-	echo Amaya configured with XML support
+    if test "$with_math" = "yes" ; then
+	echo Amaya configured with Math support
     fi
 fi