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

Diff for /Amaya/configure.in between versions 1.48 and 1.49

version 1.48, 1999/10/04 14:20:15 version 1.49, 1999/10/20 11:09:58
Line 478  AC_ARG_ENABLE(plugin,  [  --enable-plugi Line 478  AC_ARG_ENABLE(plugin,  [  --enable-plugi
 AC_ARG_ENABLE(math,    [  --enable-math           Add Math support ])  AC_ARG_ENABLE(math,    [  --enable-math           Add Math support ])
 AC_ARG_ENABLE(graph,   [  --enable-graph          Add Graphics support ])  AC_ARG_ENABLE(graph,   [  --enable-graph          Add Graphics support ])
 AC_ARG_ENABLE(annot,   [  --enable-annot          Add Annotations support ])  AC_ARG_ENABLE(annot,   [  --enable-annot          Add Annotations 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 548  dnl Line 547  dnl
 dnl graph is disabled by default  dnl graph is disabled by default
 dnl  dnl
 if test "$with_graph" = "" ; then  if test "$with_graph" = "" ; then
     if test "$enable_graph" = "yes" ; then      if test "$enable_graph" = "no" ; then
         with_graph="yes"  
     else  
         with_graph="no"          with_graph="no"
       else
           with_graph="yes"
     fi      fi
 fi  fi
   
Line 566  if test "$with_annot" = "" ; then Line 565  if test "$with_annot" = "" ; 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  
   
 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  if test "$build_amaya" = "yes" ; then
   
Line 664  if test "$build_amaya" = "yes" ; then Line 623  if test "$build_amaya" = "yes" ; then
     fi      fi
   
     if test ! -f $srcdir/../libwww/Makefile.in ; then      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(libwww sources not found !!)
             AC_MSG_WARN(Disabling Amaya build !)              AC_MSG_WARN(Disabling Amaya build !)
             build_amaya="no"              build_amaya="no"
Line 696  if test "$build_amaya" = "yes" ; then Line 655  if test "$build_amaya" = "yes" ; then
             with_annot="no"              with_annot="no"
         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 711  THOT_OPTIONS= Line 665  THOT_OPTIONS=
 AMAYA_OPTIONS=$MATH_OPTIONS $GRAPH_OPTIONS  AMAYA_OPTIONS=$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_awt_option"
 AMAYA_ANNOT_OPTIONS=  AMAYA_ANNOT_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 767  AC_SUBST(AMAYA_ANNOT_OPTIONS) Line 717  AC_SUBST(AMAYA_ANNOT_OPTIONS)
 AC_SUBST(IMGLIBS)  AC_SUBST(IMGLIBS)
 AC_SUBST(EXTRA_LIBS)  AC_SUBST(EXTRA_LIBS)
   
 AC_SUBST(ILUHOME)  
 AC_SUBST(ILU_OPTIONS)  
 AC_SUBST(ILU_INCLUDES)  
 AC_SUBST(ILU_LIBRARIES)  
   
 dnl  dnl
 dnl Include the option Makefile.xxx fragment according to the configure options  dnl Include the option Makefile.xxx fragment according to the configure options
 dnl  dnl
Line 805  else Line 750  else
     javasrc_frag=/dev/null      javasrc_frag=/dev/null
     javanosrc_frag=/dev/null      javanosrc_frag=/dev/null
   
     if test "$with_ilu" = "yes" ; then      AC_SUBST_FILE(java_frag)
        AC_SUBST_FILE(java_frag)      AC_SUBST_FILE(www_frag)dnl
        AC_SUBST_FILE(www_frag)      www_frag=$srcdir/amaya/Makefile.libwww
        www_frag=/dev/null  
     else  
        AC_SUBST_FILE(java_frag)  
        AC_SUBST_FILE(www_frag)dnl  
        www_frag=$srcdir/amaya/Makefile.libwww  
     fi  
 fi  fi
   
 if test "$with_math" = "yes" ; then  if test "$with_math" = "yes" ; then
Line 840  else Line 779  else
     annot_frag=/dev/null      annot_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
Line 885  tools/dns_daemon/Makefile javalib/Makefi Line 817  tools/dns_daemon/Makefile javalib/Makefi
 $srcdir/tools/dns_daemon/Makefile.in \  $srcdir/tools/dns_daemon/Makefile.in \
 $srcdir/javalib/Makefile.in"  $srcdir/javalib/Makefile.in"
     fi      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  fi
   
 if test "$build_thot" = "yes" ; then  if test "$build_thot" = "yes" ; then
Line 1002  dnl        AC_MSG_WARN(Beware this combi Line 927  dnl        AC_MSG_WARN(Beware this combi
                 fi                  fi
             fi              fi
             echo Using kaffe-$KAFFE_VER Java virtual machine              echo Using kaffe-$KAFFE_VER Java virtual machine
         else if test "$with_ilu" = "no" ; then          else
             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 1019  dnl        AC_MSG_WARN(Beware this combi Line 943  dnl        AC_MSG_WARN(Beware this combi
     if test "$with_annot" = "yes" ; then      if test "$with_annot" = "yes" ; then
         echo Amaya configured with Annotations support          echo Amaya configured with Annotations 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.48  
changed lines
  Added in v.1.49

Webmaster