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

Diff for /Amaya/configure.in between versions 1.69 and 1.70

version 1.69, 2001/10/19 11:01:56 version 1.70, 2001/10/19 13:17:33
Line 18  dnl Line 18  dnl
 dnl Verify that configure is not being called in the Amaya directory  dnl Verify that configure is not being called in the Amaya directory
 dnl  dnl
 if test -d batch -a -f configure.in ; then  if test -d batch -a -f configure.in ; then
      echo 
      echo "****************************************************************"
    echo ERROR: You must invoke the configure script in a subidrectory     echo ERROR: You must invoke the configure script in a subidrectory
    echo under the Amaya tree.     echo under the Amaya tree.
    echo For example:     echo For example:
    echo "  cd Amaya ; mkdir obj ; cd obj ; ../configure [your options] "     echo "  cd Amaya ; mkdir obj ; cd obj ; ../configure [your options] "
      echo "****************************************************************"
      echo 
    exit 1     exit 1
 fi  fi
   
Line 505  dnl Line 509  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(svg,   [  --disable-svg           remove SVG 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 ])
   AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])
   AC_ARG_ENABLE(annot-threads, [  --disable-annot-threads remove annotation threads ])
   AC_ARG_ENABLE(i18n,          [  --with-18n              enable I18N support (experimental) ])
   
 dnl  dnl
 dnl plugins support is disabled by default  dnl plugins support is disabled by default
Line 542  if test "$with_annot" = "" ; then Line 549  if test "$with_annot" = "" ; then
     fi      fi
 fi  fi
   
   dnl
   dnl Generic XML support enabled by default
   dnl
   if test "$with_generic_xml" = "" ; then
       if test "$enable_generic_xml" = "no" ; then
           with_generic_xml="no"
           GENERIC_XML_OPTIONS=
       else
           with_generic_xml="yes"
           GENERIC_XML_OPTIONS=-DXML_GENERIC
       fi
   fi
   
   dnl
   dnl Annotation thread support disabled by default
   dnl
   if test "$with_annot_threads" = "" ; then
       if test "$enable_annot_threads" = "yes" ; then
           with_annot_threads="yes"
           ANNOT_THREAD_OPTIONS=-DANNOT_ON_ANNOT
       else
           with_annot_threads="no"
           ANNOT_THREAD_OPTIONS=
       fi
   fi
   
   dnl
   dnl I18N support disabled by default
   dnl
   if test "$with_i18n" = "" ; then
       if test "$enable_i18n" = "yes" ; then
           with_i18n="yes"
           I18N_OPTIONS=-D_I18N_
       else
           with_i18n="no"
           I18N_OPTIONS=""
       fi
   fi
   
 if test "$build_amaya" = "yes" ; then  if test "$build_amaya" = "yes" ; then
     if test ! -f $srcdir/../libwww/Makefile.in ; then      if test ! -f $srcdir/../libwww/Makefile.in ; then
Line 576  if test "$build_amaya" = "yes" ; then Line 621  if test "$build_amaya" = "yes" ; then
         fi          fi
     fi      fi
   
       if test "$with_annot" = "no" -a "$with_annot_threads" = "yes" ; then
           AC_MSG_WARN(You must select the annotation support to have threads)
           AC_MSG_WARN(Disabling annotation thread support)
           with_annot_threads="no"
           ANNOT_THREAD_OPTIONS=
       fi
   
     if test "$with_plugin" = "yes" ; then      if test "$with_plugin" = "yes" ; then
         AC_MSG_WARN(The plugin library isn't supported anymore in Amaya !!)          AC_MSG_WARN(The plugin library isn't supported anymore in Amaya !!)
         AC_MSG_WARN(Disabling plugin build !)          AC_MSG_WARN(Disabling plugin build !)
Line 588  dnl Line 640  dnl
 dnl The options for each library or binary  dnl The options for each library or binary
 dnl  dnl
   
 THOT_OPTIONS="$GTK_OPTIONS"  THOT_OPTIONS="$GTK_OPTIONS $I18N_OPTIONS"
 AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS"  AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $ANNOT_THREAD_OPTIONS"
 #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"  #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
 AMAYA_ANNOT_OPTIONS=  AMAYA_ANNOT_OPTIONS="$ANNOT_THREAD_OPTIONS"
 IMGLIBS="-ljpeg -lpng -lz"  IMGLIBS="-ljpeg -lpng -lz"
 EXTRA_LIBS=  EXTRA_LIBS=
   
Line 753  if test "$build_amaya" = "yes" ; then Line 805  if test "$build_amaya" = "yes" ; then
     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_annot_threads" = "yes" ; then
           echo Amaya configured with Annotation threads support
       fi
       if test "$with_generic_xml" = "yes" ; then
           echo Amaya configured with generic XML suppport
       fi
       if test "$with_i18n" = "yes" ; then
           echo Amaya configured with I18N suppport \(experimental\)
       fi
 fi  fi
   
 if test "$no_motif" = yes ; then  if test "$no_motif" = yes ; then
Removed from v.1.69  
changed lines
  Added in v.1.70

Webmaster