Diff for /Amaya/configure.in between versions 1.25 and 1.26

version 1.25, 1998/02/19 19:56:52 version 1.26, 1998/03/30 14:49:08
Line 316  dnl    SPECIFIC STUFF : CONFIGURATION OP Line 316  dnl    SPECIFIC STUFF : CONFIGURATION OP
 dnl  dnl
 dnl  ***************************************************************  dnl  ***************************************************************
   
 THOT_VER="2.1d"  THOT_VER="2.2"
 AMAYA_VER="1.1c"  AMAYA_VER="1.3"
 KAFFE_VER="0.9.2"  KAFFE_VER="0.9.2"
 LIBWWW_VER="5.0a"  LIBWWW_VER="5.0a"
   
Line 418  dnl Check for additionnal packages kaffe Line 418  dnl Check for additionnal packages kaffe
 dnl use AC_CONFIG_SUBDIRS to launch configure in the subdir  dnl use AC_CONFIG_SUBDIRS to launch configure in the subdir
 dnl  dnl
   
 AC_ARG_ENABLE(java, [  --enable-java           Add Kaffe Java virtual machine])  AC_ARG_ENABLE(java,    [  --enable-java           Add Kaffe Java virtual machine])
 AC_ARG_ENABLE(javaawt, [  --enable-java-awt       Add Kaffe Java Biss AWT])  AC_ARG_ENABLE(javaawt, [  --enable-java-awt       Add Kaffe Java Biss AWT])
 AC_ARG_ENABLE(intr, [  --enable-intr           Use Kaffe Java Interpreter])  AC_ARG_ENABLE(intr,    [  --enable-intr           Use Kaffe Java Interpreter])
 AC_ARG_ENABLE(jit, [  --enable-jit             Use Kaffe Java JIT Compiler])  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(plugin,  [  --enable-plugin         Add Netscape Plug-Ins support])
 AC_ARG_ENABLE(math, [  --enable-math             Add Math support ])  AC_ARG_ENABLE(math,    [  --enable-math           Add Math support ])
 AC_ARG_ENABLE(ilu, [  --enable-ilu            Add ILU support])  AC_ARG_ENABLE(graph,   [  --enable-graph          Add Graphics support ])
   AC_ARG_ENABLE(ilu,     [  --enable-ilu            Add ILU support])
   
 dnl  dnl
 dnl Check for the Kaffe engine to use : interpreter or JIT  dnl Check for the Kaffe engine to use : interpreter or JIT
Line 491  if test "$with_math" = "" ; then Line 492  if test "$with_math" = "" ; then
 fi  fi
   
 dnl  dnl
   dnl graph is disabled by default
   dnl
   if test "$with_graph" = "" ; then
       if test "$enable_graph" = "yes" ; then
           with_graph="yes"
       else
           with_graph="no"
       fi
   fi
   
   dnl
 dnl ilu is disabled by default  dnl ilu is disabled by default
 dnl  dnl
 if test "$with_ilu" = "" ; then  if test "$with_ilu" = "" ; then
Line 594  if test "$build_amaya" = "yes" ; then Line 606  if test "$build_amaya" = "yes" ; then
     if test ! -f $srcdir/amaya/MathML.S ; then      if test ! -f $srcdir/amaya/MathML.S ; then
         if test "$with_math" = "yes" ; then          if test "$with_math" = "yes" ; then
             AC_MSG_WARN(MathML sources not found !!)              AC_MSG_WARN(MathML sources not found !!)
             AC_MSG_WARN(Disabling MATH build !)              AC_MSG_WARN(Disabling Math build !)
             with_math="no"              with_math="no"
             MATH_OPTIONS=              MATH_OPTIONS=
         fi          fi
     fi      fi
   
       if test ! -f $srcdir/amaya/GraphML.S ; then
           if test "$with_graph" = "yes" ; then
               AC_MSG_WARN(GraphML sources not found !!)
               AC_MSG_WARN(Disabling Graphics build !)
               with_graph="no"
               GRAPH_OPTIONS=
           fi
       fi
   
     if test "$with_java" = "yes" -a "$with_ilu" = "yes" ; then      if test "$with_java" = "yes" -a "$with_ilu" = "yes" ; then
         java_ilu_option="-DWITH_ILU"          java_ilu_option="-DWITH_ILU"
         ilu_java_option="-DWITH_JAVA"          ilu_java_option="-DWITH_JAVA"
Line 610  dnl The options for each library or bina Line 632  dnl The options for each library or bina
 dnl  dnl
   
 THOT_OPTIONS=  THOT_OPTIONS=
 AMAYA_OPTIONS="-DCOUGAR" $MATH_OPTIONS  AMAYA_OPTIONS="-DCOUGAR" $MATH_OPTIONS $GRAPH_OPTIONS
 PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"  PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
 dnl JAVA_OPTIONS="-DDEBUG_KAFFE -DDEBUG_LOCK -DDEBUG_SELECT -DDEBUG_SELECT_CHANNELS -DDEBUG_TIMING -DSYNC_DNS"  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_ilu_option $java_awt_option"
Line 724  else Line 746  else
     math_frag=/dev/null      math_frag=/dev/null
 fi  fi
   
   if test "$with_graph" = "yes" ; then
       AC_SUBST_FILE(graph_frag)
       graph_frag=$srcdir/amaya/Makefile.graph
   else
       AC_SUBST_FILE(graph_frag)
       graph_frag=/dev/null
   fi
   
 if test "$with_ilu" = "yes" ; then  if test "$with_ilu" = "yes" ; then
     AC_SUBST_FILE(ilu_frag)      AC_SUBST_FILE(ilu_frag)
     ilu_frag=$srcdir/ilulib/Makefile.ilu      ilu_frag=$srcdir/ilulib/Makefile.ilu
Line 888  dnl        AC_MSG_WARN(Beware this combi Line 918  dnl        AC_MSG_WARN(Beware this combi
     if test "$with_math" = "yes" ; then      if test "$with_math" = "yes" ; then
         echo Amaya configured with Math support          echo Amaya configured with Math support
     fi      fi
       if test "$with_graph" = "yes" ; then
           echo Amaya configured with Graph support
       fi
     if test "$with_ilu" = "yes" ; then      if test "$with_ilu" = "yes" ; then
         echo Amaya configured with ILU support          echo Amaya configured with ILU support
     fi      fi

Removed from v.1.25  
changed lines
  Added in v.1.26


Webmaster