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

Diff for /Amaya/configure.in between versions 1.67 and 1.68

version 1.67, 2001/08/17 10:10:47 version 1.68, 2001/09/05 12:42:06
Line 446  dnl    SPECIFIC STUFF : CONFIGURATION OP Line 446  dnl    SPECIFIC STUFF : CONFIGURATION OP
 dnl  dnl
 dnl  ***************************************************************  dnl  ***************************************************************
   
 AMAYA_VER="5.1"  AMAYA_VER="6.0"
   
 dnl  dnl
 dnl We use a special versoin of cextract patched for alignment  dnl We use a special versoin of cextract patched for alignment
Line 494  dnl Line 494  dnl
 dnl Check for additionnal packages  dnl Check for additionnal packages
 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(graph,   [  --disable-graph         remove Graphics support ])  AC_ARG_ENABLE(svg,   [  --disable-svg           remove SVG support ])
 AC_ARG_ENABLE(annot,   [  --disable-annot         remove Annotations support ])  AC_ARG_ENABLE(annot,   [  --disable-annot         remove Annotations support ])
   
 dnl  dnl
Line 510  if test "$with_plugin" = "" ; then Line 510  if test "$with_plugin" = "" ; then
 fi    fi  
   
 dnl  dnl
 dnl graph is enabled by default  dnl svg is enabled by default
 dnl  dnl
 if test "$with_graph" = "" ; then  if test "$with_svg" = "" ; then
     if test "$enable_graph" = "no" ; then      if test "$enable_svg" = "no" ; then
         with_graph="no"          with_svg="no"
     else      else
         with_graph="yes"          with_svg="yes"
     fi      fi
 fi  fi
   
Line 548  if test "$build_amaya" = "yes" ; then Line 548  if test "$build_amaya" = "yes" ; then
         fi          fi
     fi      fi
   
     if test ! -f $srcdir/amaya/GraphML.S ; then      if test ! -f $srcdir/amaya/SVG.S ; then
         if test "$with_graph" = "yes" ; then          if test "$with_svg" = "yes" ; then
             AC_MSG_WARN(GraphML sources not found !!)              AC_MSG_WARN(SVG sources not found !!)
             AC_MSG_WARN(Disabling Graphics build !)              AC_MSG_WARN(Disabling SVG build !)
             with_graph="no"              with_svg="no"
             GRAPH_OPTIONS=              SVG_OPTIONS=
         fi          fi
     fi      fi
   
Line 578  dnl The options for each library or bina Line 578  dnl The options for each library or bina
 dnl  dnl
   
 THOT_OPTIONS="$GTK_OPTIONS"  THOT_OPTIONS="$GTK_OPTIONS"
 AMAYA_OPTIONS="$MATH_OPTIONS $GRAPH_OPTIONS $GTK_OPTIONS"  AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS"
 #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"  #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
 AMAYA_ANNOT_OPTIONS=  AMAYA_ANNOT_OPTIONS=
 IMGLIBS="-ljpeg -lpng -lz"  IMGLIBS="-ljpeg -lpng -lz"
Line 655  else Line 655  else
     math_frag=$srcdir/amaya/Makefile.math      math_frag=$srcdir/amaya/Makefile.math
 fi  fi
   
 if test "$with_graph" = "no" ; then  if test "$with_svg" = "no" ; then
     AC_SUBST_FILE(graph_frag)      AC_SUBST_FILE(svg_frag)
     graph_frag=/dev/null      svg_frag=/dev/null
 else  else
     AC_SUBST_FILE(graph_frag)      AC_SUBST_FILE(svg_frag)
     graph_frag=$srcdir/amaya/Makefile.graph      svg_frag=$srcdir/amaya/Makefile.svg
 fi  fi
   
 if test "$with_annot" = "yes" ; then  if test "$with_annot" = "yes" ; then
Line 736  if test "$build_amaya" = "yes" ; then Line 736  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_graph" = "yes" ; then      if test "$with_svg" = "yes" ; then
         echo Amaya configured with Graph support          echo Amaya configured with SVG support
     fi      fi
     if test "$with_annot" = "yes" ; then      if test "$with_annot" = "yes" ; then
         echo Amaya configured with Annotations support          echo Amaya configured with Annotations support
Removed from v.1.67  
changed lines
  Added in v.1.68

Webmaster