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

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

version 1.47, 1999/09/23 14:39:57 version 1.48, 1999/10/04 14:20:15
Line 689  if test "$build_amaya" = "yes" ; then Line 689  if test "$build_amaya" = "yes" ; then
         fi          fi
     fi      fi
   
     if test ! -f $srcdir/amaya/Makefile.annot ; then      if test ! -f $srcdir/annotlib/Makefile.in ; then
         if test "$with_annot" = "yes" ; then          if test "$with_annot" = "yes" ; then
             AC_MSG_WARN(Annotation makefile not found !!)              AC_MSG_WARN(Annotation makefile not found !!)
             AC_MSG_WARN(Disabling Annotations build !)              AC_MSG_WARN(Disabling Annotations build !)
Line 712  AMAYA_OPTIONS=$MATH_OPTIONS $GRAPH_OPTIO Line 712  AMAYA_OPTIONS=$MATH_OPTIONS $GRAPH_OPTIO
 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_ilu_option $java_awt_option"
 ANNOTATIONS_OPTIONS=  AMAYA_ANNOT_OPTIONS=
 IMGLIBS="-ljpeg -lpng -lz"  IMGLIBS="-ljpeg -lpng -lz"
 EXTRA_LIBS=  EXTRA_LIBS=
   
Line 763  AC_SUBST(THOT_OPTIONS) Line 763  AC_SUBST(THOT_OPTIONS)
 AC_SUBST(AMAYA_OPTIONS)  AC_SUBST(AMAYA_OPTIONS)
 AC_SUBST(PLUGIN_OPTIONS)  AC_SUBST(PLUGIN_OPTIONS)
 AC_SUBST(JAVA_OPTIONS)  AC_SUBST(JAVA_OPTIONS)
 AC_SUBST(ANNOTATIONS_OPTIONS)  AC_SUBST(AMAYA_ANNOT_OPTIONS)
 AC_SUBST(IMGLIBS)  AC_SUBST(IMGLIBS)
 AC_SUBST(EXTRA_LIBS)  AC_SUBST(EXTRA_LIBS)
   
Line 773  AC_SUBST(ILU_INCLUDES) Line 773  AC_SUBST(ILU_INCLUDES)
 AC_SUBST(ILU_LIBRARIES)  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 according to the configure options
 dnl  dnl
   
 if test "$with_plugin" = "yes" ; then  if test "$with_plugin" = "yes" ; then
Line 834  fi Line 834  fi
   
 if test "$with_annot" = "yes" ; then  if test "$with_annot" = "yes" ; then
     AC_SUBST_FILE(annot_frag)      AC_SUBST_FILE(annot_frag)
     annot_frag=$srcdir/amaya/Makefile.annot      annot_frag=$srcdir/annotlib/Makefile.annot
 else  else
     AC_SUBST_FILE(annot_frag)      AC_SUBST_FILE(annot_frag)
     annot_frag=/dev/null      annot_frag=/dev/null
Line 873  $srcdir/amaya/Makefile.libwww" Line 873  $srcdir/amaya/Makefile.libwww"
 $srcdir/pluginlib/Makefile.plugin"  $srcdir/pluginlib/Makefile.plugin"
     fi      fi
   
       if test "$with_annot" = "yes" ; then
          make_output="$make_output annotlib/Makefile"
          EXTRA_MAKEFILE_IN="$srcdir/annotlib/Makefile.in"
       fi
   
     if test "$with_java" = "yes" ; then      if test "$with_java" = "yes" ; then
        make_output="$make_output tools/javastub/Makefile \         make_output="$make_output tools/javastub/Makefile \
 tools/dns_daemon/Makefile javalib/Makefile"  tools/dns_daemon/Makefile javalib/Makefile"
Line 1039  fi Line 1044  fi
   
 echo "Now start \"make all\" (GNU make preferably) to build the binaries"  echo "Now start \"make all\" (GNU make preferably) to build the binaries"
   
   
   
   
Removed from v.1.47  
changed lines
  Added in v.1.48

Webmaster