--- Amaya/configure.in 2001/08/17 10:10:47 1.67 +++ Amaya/configure.in 2001/09/05 12:42:06 1.68 @@ -446,7 +446,7 @@ dnl SPECIFIC STUFF : CONFIGURATION OP dnl dnl *************************************************************** -AMAYA_VER="5.1" +AMAYA_VER="6.0" dnl dnl We use a special versoin of cextract patched for alignment @@ -494,7 +494,7 @@ dnl dnl Check for additionnal packages dnl use AC_CONFIG_SUBDIRS to launch configure in the subdir 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 ]) dnl @@ -510,13 +510,13 @@ if test "$with_plugin" = "" ; then fi dnl -dnl graph is enabled by default +dnl svg is enabled by default dnl -if test "$with_graph" = "" ; then - if test "$enable_graph" = "no" ; then - with_graph="no" +if test "$with_svg" = "" ; then + if test "$enable_svg" = "no" ; then + with_svg="no" else - with_graph="yes" + with_svg="yes" fi fi @@ -548,12 +548,12 @@ if test "$build_amaya" = "yes" ; then 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= + if test ! -f $srcdir/amaya/SVG.S ; then + if test "$with_svg" = "yes" ; then + AC_MSG_WARN(SVG sources not found !!) + AC_MSG_WARN(Disabling SVG build !) + with_svg="no" + SVG_OPTIONS= fi fi @@ -578,7 +578,7 @@ dnl The options for each library or bina dnl 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" AMAYA_ANNOT_OPTIONS= IMGLIBS="-ljpeg -lpng -lz" @@ -655,12 +655,12 @@ else math_frag=$srcdir/amaya/Makefile.math fi -if test "$with_graph" = "no" ; then - AC_SUBST_FILE(graph_frag) - graph_frag=/dev/null +if test "$with_svg" = "no" ; then + AC_SUBST_FILE(svg_frag) + svg_frag=/dev/null else - AC_SUBST_FILE(graph_frag) - graph_frag=$srcdir/amaya/Makefile.graph + AC_SUBST_FILE(svg_frag) + svg_frag=$srcdir/amaya/Makefile.svg fi if test "$with_annot" = "yes" ; then @@ -736,8 +736,8 @@ if test "$build_amaya" = "yes" ; then if test "$with_math" = "yes" ; then echo Amaya configured with Math support fi - if test "$with_graph" = "yes" ; then - echo Amaya configured with Graph support + if test "$with_svg" = "yes" ; then + echo Amaya configured with SVG support fi if test "$with_annot" = "yes" ; then echo Amaya configured with Annotations support