--- Amaya/configure.in	1997/08/25 15:30:54	1.15
+++ Amaya/configure.in	1997/09/03 16:43:25	1.16
@@ -426,6 +426,7 @@ AC_ARG_ENABLE(intr, [  --enable-intr
 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 ])
+AC_ARG_ENABLE(ilu, [  --enable-ilu            Add ILU support])
 
 dnl
 dnl Check for the Kaffe engine to use : interpreter or JIT
@@ -503,6 +504,17 @@ if test "$with_math" = "" ; then
     fi
 fi
 
+dnl
+dnl ilu is disabled by default
+dnl
+if test "$with_ilu" = "" ; then
+    if test "$enable_ilu" = "yes" ; then
+	with_ilu="yes"
+    else
+	with_ilu="no"
+    fi
+fi
+
 if test "$build_amaya" = "yes" ; then 
     if test ! -f $srcdir/kaffe-$KAFFE_VER/Makefile.in ; then
 	if test "$with_java" = "yes" ; then
@@ -520,7 +532,6 @@ if test "$build_amaya" = "yes" ; then
 		-f $srcdir/classes/w3c/amaya/amayaInit.java -a \
 		-f $srcdir/classes/w3c/www/protocol/http/HttpURLConnection.java \
 		; then
-	    AC_MSG_WARN(Amaya Java classes sources available)
 	    with_java_sources="yes"
 	else
 	    with_java_sources="no"
@@ -548,7 +559,7 @@ if test "$build_amaya" = "yes" ; then
     fi
 
     if test ! -f $srcdir/w3c-libwww-$LIBWWW_VER/Makefile.in ; then
-	if test "$with_java" = "no" ; then
+	if test "$with_java" = "no" -a "$with_ilu" = "no" ; then
 	    AC_MSG_WARN(w3c-libwww-$LIBWWW_VER sources not found !!)
 	    AC_MSG_WARN(Disabling Amaya build !)
 	    build_amaya="no"
@@ -563,6 +574,10 @@ if test "$build_amaya" = "yes" ; then
 	    MATH_OPTIONS=
 	fi
     fi
+    if test "$with_java" = "yes" -a "$with_ilu" = "yes" ; then
+        java_ilu_option="-DWITH_ILU"
+        ilu_java_option="-DWITH_JAVA"
+    fi
 fi
 
 dnl
@@ -573,11 +588,15 @@ THOT_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=
+JAVA_OPTIONS="$java_ilu_option"
 ANNOTATIONS_OPTIONS=
 IMGLIBS="-ljpeg -lpng -lz"
 EXTRA_LIBS=
 
+ILU_OPTIONS="$ilu_java_option"
+ILU_INCLUDES=
+ILU_LIBRARIES=
+
 dnl
 dnl Set up the PATHs needed
 dnl
@@ -626,6 +645,10 @@ AC_SUBST(ANNOTATIONS_OPTIONS)
 AC_SUBST(IMGLIBS)
 AC_SUBST(EXTRA_LIBS)
 
+AC_SUBST(ILU_OPTIONS)
+AC_SUBST(ILU_INCLUDES)
+AC_SUBST(ILU_LIBRARIES)
+
 dnl
 dnl Include the option Makefile.xxx fragment for plugin and or Java options
 dnl
@@ -654,12 +677,18 @@ if test "$with_java" = "yes" ; then
 	AC_SUBST_FILE(javanosrc_frag)
 	javanosrc_frag=$srcdir/javalib/Makefile.javanosrc
     fi
+else if test "$with_ilu" = "yes" ; then
+    AC_SUBST_FILE(java_frag)
+    java_frag=/dev/null
+    AC_SUBST_FILE(www_frag)
+    www_frag=/dev/null
 else
     AC_SUBST_FILE(java_frag)
     java_frag=/dev/null
     AC_SUBST_FILE(www_frag)dnl
     www_frag=$srcdir/amaya/Makefile.libwww
 fi
+fi
 
 if test "$with_math" = "yes" ; then
     AC_SUBST_FILE(math_frag)
@@ -669,6 +698,14 @@ else
     math_frag=/dev/null
 fi
 
+if test "$with_ilu" = "yes" ; then
+    AC_SUBST_FILE(ilu_frag)
+    ilu_frag=$srcdir/ilulib/Makefile.ilu
+else
+    AC_SUBST_FILE(ilu_frag)
+    ilu_frag=/dev/null
+fi
+
 dnl  ***************************************************************
 dnl
 dnl      FINAL STEP : PRODUCE ALL THE MAKEFILES AND CONFIG FILES
@@ -696,6 +733,15 @@ $srcdir/javalib/Makefile.in \
 $srcdir/pluginlib/Makefile.in \
 $srcdir/pluginlib/Makefile.plugin"
 
+if test "$with_ilu" = "yes" ; then
+
+    make_output="$make_output ilulib/Makefile tools/ilustub/Makefile"
+
+    EXTRA_MAKEFILE_IN="$srcdir/ilulib/Makefile.in \
+$srcdir/ilulib/Makefile.ilu \
+$srcdir/tools/ilustub/Makefile.in"
+
+fi
 fi
 
 if test "$build_thot" = "yes" ; then
@@ -795,7 +841,7 @@ fi
 if test "$build_amaya" = "yes" ; then
     if test "$with_java" = "yes" -a "$with_plugin" = "yes" ; then
         AC_MSG_WARN(Amaya configured with both Java and Plugins support)
-        AC_MSG_WARN(Beware this combination doesn't work well)
+dnl        AC_MSG_WARN(Beware this combination doesn't work well)
     else
 	if test "$with_java" = "yes" ; then
 	    if test "$KAFFE_ENGINE" = "--with-engine=jit" ;  then
@@ -808,9 +854,10 @@ if test "$build_amaya" = "yes" ; then
 		fi
             fi
 	    echo Using kaffe-$KAFFE_VER Java virtual machine
-	else
+	else if test "$with_ilu" = "no" ; then
 	    echo Amaya configured with libWWW
 	fi
+	fi
 	if test "$with_plugin" = "yes" ; then
 	    echo Amaya configured with Plugins support
 	fi
@@ -818,6 +865,9 @@ if test "$build_amaya" = "yes" ; then
     if test "$with_math" = "yes" ; then
 	echo Amaya configured with Math support
     fi
+    if test "$with_ilu" = "yes" ; then
+	echo Amaya configured with ILU support
+    fi
 fi
 
 if test "$no_motif" = yes ; then