[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [Public] / Amaya

Diff for /Amaya/configure.in between versions 1.15 and 1.16

version 1.15, 1997/08/25 15:30:54 version 1.16, 1997/09/03 16:43:25
Line 426  AC_ARG_ENABLE(intr, [  --enable-intr Line 426  AC_ARG_ENABLE(intr, [  --enable-intr
 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])
   
 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 503  if test "$with_math" = "" ; then Line 504  if test "$with_math" = "" ; then
     fi      fi
 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 "$build_amaya" = "yes" ; then 
     if test ! -f $srcdir/kaffe-$KAFFE_VER/Makefile.in ; then      if test ! -f $srcdir/kaffe-$KAFFE_VER/Makefile.in ; then
         if test "$with_java" = "yes" ; then          if test "$with_java" = "yes" ; then
Line 520  if test "$build_amaya" = "yes" ; then Line 532  if test "$build_amaya" = "yes" ; then
                 -f $srcdir/classes/w3c/amaya/amayaInit.java -a \                  -f $srcdir/classes/w3c/amaya/amayaInit.java -a \
                 -f $srcdir/classes/w3c/www/protocol/http/HttpURLConnection.java \                  -f $srcdir/classes/w3c/www/protocol/http/HttpURLConnection.java \
                 ; then                  ; then
             AC_MSG_WARN(Amaya Java classes sources available)  
             with_java_sources="yes"              with_java_sources="yes"
         else          else
             with_java_sources="no"              with_java_sources="no"
Line 548  if test "$build_amaya" = "yes" ; then Line 559  if test "$build_amaya" = "yes" ; then
     fi      fi
   
     if test ! -f $srcdir/w3c-libwww-$LIBWWW_VER/Makefile.in ; then      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(w3c-libwww-$LIBWWW_VER sources not found !!)
             AC_MSG_WARN(Disabling Amaya build !)              AC_MSG_WARN(Disabling Amaya build !)
             build_amaya="no"              build_amaya="no"
Line 563  if test "$build_amaya" = "yes" ; then Line 574  if test "$build_amaya" = "yes" ; then
             MATH_OPTIONS=              MATH_OPTIONS=
         fi          fi
     fi      fi
       if test "$with_java" = "yes" -a "$with_ilu" = "yes" ; then
           java_ilu_option="-DWITH_ILU"
           ilu_java_option="-DWITH_JAVA"
       fi
 fi  fi
   
 dnl  dnl
Line 573  THOT_OPTIONS= Line 588  THOT_OPTIONS=
 AMAYA_OPTIONS="-DCOUGAR" $MATH_OPTIONS  AMAYA_OPTIONS="-DCOUGAR" $MATH_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_OPTIONS="$java_ilu_option"
 ANNOTATIONS_OPTIONS=  ANNOTATIONS_OPTIONS=
 IMGLIBS="-ljpeg -lpng -lz"  IMGLIBS="-ljpeg -lpng -lz"
 EXTRA_LIBS=  EXTRA_LIBS=
   
   ILU_OPTIONS="$ilu_java_option"
   ILU_INCLUDES=
   ILU_LIBRARIES=
   
 dnl  dnl
 dnl Set up the PATHs needed  dnl Set up the PATHs needed
 dnl  dnl
Line 626  AC_SUBST(ANNOTATIONS_OPTIONS) Line 645  AC_SUBST(ANNOTATIONS_OPTIONS)
 AC_SUBST(IMGLIBS)  AC_SUBST(IMGLIBS)
 AC_SUBST(EXTRA_LIBS)  AC_SUBST(EXTRA_LIBS)
   
   AC_SUBST(ILU_OPTIONS)
   AC_SUBST(ILU_INCLUDES)
   AC_SUBST(ILU_LIBRARIES)
   
 dnl  dnl
 dnl Include the option Makefile.xxx fragment for plugin and or Java options  dnl Include the option Makefile.xxx fragment for plugin and or Java options
 dnl  dnl
Line 654  if test "$with_java" = "yes" ; then Line 677  if test "$with_java" = "yes" ; then
         AC_SUBST_FILE(javanosrc_frag)          AC_SUBST_FILE(javanosrc_frag)
         javanosrc_frag=$srcdir/javalib/Makefile.javanosrc          javanosrc_frag=$srcdir/javalib/Makefile.javanosrc
     fi      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  else
     AC_SUBST_FILE(java_frag)      AC_SUBST_FILE(java_frag)
     java_frag=/dev/null      java_frag=/dev/null
     AC_SUBST_FILE(www_frag)dnl      AC_SUBST_FILE(www_frag)dnl
     www_frag=$srcdir/amaya/Makefile.libwww      www_frag=$srcdir/amaya/Makefile.libwww
 fi  fi
   fi
   
 if test "$with_math" = "yes" ; then  if test "$with_math" = "yes" ; then
     AC_SUBST_FILE(math_frag)      AC_SUBST_FILE(math_frag)
Line 669  else Line 698  else
     math_frag=/dev/null      math_frag=/dev/null
 fi  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  dnl
 dnl      FINAL STEP : PRODUCE ALL THE MAKEFILES AND CONFIG FILES  dnl      FINAL STEP : PRODUCE ALL THE MAKEFILES AND CONFIG FILES
Line 696  $srcdir/javalib/Makefile.in \ Line 733  $srcdir/javalib/Makefile.in \
 $srcdir/pluginlib/Makefile.in \  $srcdir/pluginlib/Makefile.in \
 $srcdir/pluginlib/Makefile.plugin"  $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  fi
   
 if test "$build_thot" = "yes" ; then  if test "$build_thot" = "yes" ; then
Line 795  fi Line 841  fi
 if test "$build_amaya" = "yes" ; then  if test "$build_amaya" = "yes" ; then
     if test "$with_java" = "yes" -a "$with_plugin" = "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(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      else
         if test "$with_java" = "yes" ; then          if test "$with_java" = "yes" ; then
             if test "$KAFFE_ENGINE" = "--with-engine=jit" ;  then              if test "$KAFFE_ENGINE" = "--with-engine=jit" ;  then
Line 808  if test "$build_amaya" = "yes" ; then Line 854  if test "$build_amaya" = "yes" ; then
                 fi                  fi
             fi              fi
             echo Using kaffe-$KAFFE_VER Java virtual machine              echo Using kaffe-$KAFFE_VER Java virtual machine
         else          else if test "$with_ilu" = "no" ; then
             echo Amaya configured with libWWW              echo Amaya configured with libWWW
         fi          fi
           fi
         if test "$with_plugin" = "yes" ; then          if test "$with_plugin" = "yes" ; then
             echo Amaya configured with Plugins support              echo Amaya configured with Plugins support
         fi          fi
Line 818  if test "$build_amaya" = "yes" ; then Line 865  if test "$build_amaya" = "yes" ; then
     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_ilu" = "yes" ; then
           echo Amaya configured with ILU support
       fi
 fi  fi
   
 if test "$no_motif" = yes ; then  if test "$no_motif" = yes ; then
Removed from v.1.15  
changed lines
  Added in v.1.16

Webmaster