--- Amaya/configure.in 1999/10/04 14:20:15 1.48 +++ Amaya/configure.in 1999/10/20 11:09:58 1.49 @@ -478,7 +478,6 @@ AC_ARG_ENABLE(plugin, [ --enable-plugi AC_ARG_ENABLE(math, [ --enable-math Add Math support ]) AC_ARG_ENABLE(graph, [ --enable-graph Add Graphics support ]) AC_ARG_ENABLE(annot, [ --enable-annot Add Annotations support ]) -AC_ARG_ENABLE(ilu, [ --enable-ilu Add ILU support]) dnl dnl Check for the Kaffe engine to use : interpreter or JIT @@ -548,10 +547,10 @@ dnl dnl graph is disabled by default dnl if test "$with_graph" = "" ; then - if test "$enable_graph" = "yes" ; then - with_graph="yes" - else + if test "$enable_graph" = "no" ; then with_graph="no" + else + with_graph="yes" fi fi @@ -566,46 +565,6 @@ if test "$with_annot" = "" ; 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 - -dnl -dnl Checking for ilu -dnl - -ILUHOME="" -if test "$with_ilu" = "yes" ; then - dnl - dnl try to get first the path for the c-stubber - dnl - AC_PATH_PROG(CSTUBBER, c-stubber, c-stubber, $PATH:$ILUHOME/bin:/bin:/usr/bin:/usr/ucb/bin:/usr/ilu/bin:/usr/local/bin:/usr/local/ilu/bin:/opt/ilu/bin:$HOME/ilu/bin) - case "$CSTUBBER" in - /*/bin/c-stubber) - ILU_BINARIES=`dirname $CSTUBBER` - ILUHOME=`dirname $ILU_BINARIES` - ILU_LIBRARIES=$ILUHOME/lib - ILU_INCLUDES=$ILUHOME/include - ;; - /*/c-stubber) - ILU_BINARIES=`dirname $CSTUBBER` - ILUHOME=`dirname $ILU_BINARIES` - ILU_LIBRARIES=$ILUHOME/lib - ILU_INCLUDES=$ILUHOME/include - ;; - esac - if test "$CSTUBBER" = "" -o "$CSTUBBER" = "c-stubber" ; then - AC_MSG_WARN(ILU c-stubber binary not found, ILU disabled !) - with_ilu="no" - fi -fi if test "$build_amaya" = "yes" ; then @@ -664,7 +623,7 @@ if test "$build_amaya" = "yes" ; then fi if test ! -f $srcdir/../libwww/Makefile.in ; then - if test "$with_java" = "no" -a "$with_ilu" = "no" ; then + if test "$with_java" = "no" ; then AC_MSG_WARN(libwww sources not found !!) AC_MSG_WARN(Disabling Amaya build !) build_amaya="no" @@ -696,11 +655,6 @@ if test "$build_amaya" = "yes" ; then with_annot="no" 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 @@ -711,15 +665,11 @@ THOT_OPTIONS= AMAYA_OPTIONS=$MATH_OPTIONS $GRAPH_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_ilu_option $java_awt_option" +JAVA_OPTIONS="$java_awt_option" AMAYA_ANNOT_OPTIONS= IMGLIBS="-ljpeg -lpng -lz" EXTRA_LIBS= -ILU_OPTIONS="$ilu_java_option" -ILU_INCLUDES= -ILU_LIBRARIES= - dnl dnl Set up the PATHs needed dnl @@ -767,11 +717,6 @@ AC_SUBST(AMAYA_ANNOT_OPTIONS) AC_SUBST(IMGLIBS) AC_SUBST(EXTRA_LIBS) -AC_SUBST(ILUHOME) -AC_SUBST(ILU_OPTIONS) -AC_SUBST(ILU_INCLUDES) -AC_SUBST(ILU_LIBRARIES) - dnl dnl Include the option Makefile.xxx fragment according to the configure options dnl @@ -805,15 +750,9 @@ else javasrc_frag=/dev/null javanosrc_frag=/dev/null - if test "$with_ilu" = "yes" ; then - AC_SUBST_FILE(java_frag) - AC_SUBST_FILE(www_frag) - www_frag=/dev/null - else - AC_SUBST_FILE(java_frag) - AC_SUBST_FILE(www_frag)dnl - www_frag=$srcdir/amaya/Makefile.libwww - fi + AC_SUBST_FILE(java_frag) + AC_SUBST_FILE(www_frag)dnl + www_frag=$srcdir/amaya/Makefile.libwww fi if test "$with_math" = "yes" ; then @@ -840,13 +779,6 @@ else annot_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 @@ -885,13 +817,6 @@ tools/dns_daemon/Makefile javalib/Makefi $srcdir/tools/dns_daemon/Makefile.in \ $srcdir/javalib/Makefile.in" fi - - 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 @@ -1002,10 +927,9 @@ dnl AC_MSG_WARN(Beware this combi fi fi echo Using kaffe-$KAFFE_VER Java virtual machine - else if test "$with_ilu" = "no" ; then + else echo Amaya configured with libWWW fi - fi if test "$with_plugin" = "yes" ; then echo Amaya configured with Plugins support fi @@ -1019,9 +943,6 @@ dnl AC_MSG_WARN(Beware this combi if test "$with_annot" = "yes" ; then echo Amaya configured with Annotations support fi - if test "$with_ilu" = "yes" ; then - echo Amaya configured with ILU support - fi fi if test "$no_motif" = yes ; then