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

Diff for /Amaya/configure.in between versions 1.207 and 1.208

version 1.207, 2006/10/03 14:01:30 version 1.208, 2006/10/25 15:33:33
Line 223  fi Line 223  fi
   
 # check if gtk gui should be used  # check if gtk gui should be used
 AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])  AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])
 if test "$with_gtk" = "yes" -o "$enable_gtk" = "yes" ; then  if test "$with_gtk" = "yes" ; then
   if test "$withval" = "no" ; then    if test "$withval" = "no" ; then
     with_gtk="no"      with_gtk="no"
     with_wx="yes"      with_wx="yes"
Line 235  fi Line 235  fi
   
 # check if wxWidgets gui should be used  # check if wxWidgets gui should be used
 AC_ARG_WITH(wx, [  --with-wx               use wxWidgets GUI toolkit])  AC_ARG_WITH(wx, [  --with-wx               use wxWidgets GUI toolkit])
 if test "$with_wx" = "yes" -o "$enable_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
   if test "$withval" = "no" ; then    if test "$withval" = "no" ; then
     with_wx="no"      with_wx="no"
   else    else
Line 253  fi Line 253  fi
 # check for mesa library (OpenGL)  # check for mesa library (OpenGL)
 AC_ARG_WITH(MESA,              [  --with-mesa         enable canvas with software OpenGL implementation (Mesa) ])  AC_ARG_WITH(MESA,              [  --with-mesa         enable canvas with software OpenGL implementation (Mesa) ])
 if test "$with_mesa" = "" ; then  if test "$with_mesa" = "" ; then
  if test "$enable_mesa" = "yes" ; then    with_mesa="no"
     with_mesa="yes"  
     with_gl="no"  
   else  
     with_mesa="no"  
   fi  
 fi  fi
   
   
Line 283  if test "$with_wx" = "yes" -o "$with_wx" Line 278  if test "$with_wx" = "yes" -o "$with_wx"
  fi   fi
 fi  fi
   
 # check if no gui is enable  
 AC_ARG_WITH(nogui, [  --with-nogui            do not use GUI toolkit (not maintained) ])  
 if test "$with_nogui" = "yes" -o "$enable_nogui" = "yes" ; then  
   with_nogui="yes"  
   with_gtk="no"  
   with_wx="no"  
   NOGUI_OPTIONS="-D_NOGUI"  
 fi  
   
 # check if wxWidgets debug is enable  # check if wxWidgets debug is enable
 AC_ARG_WITH(wxdebug,              [  --with-wxdebug          compiles wxWidgets with debuging options ])  AC_ARG_WITH(wxdebug,              [  --with-wxdebug          compiles wxWidgets with debuging options ])
 if test "$with_wxdebug" = "yes" ; then  if test "$with_wxdebug" = "yes" ; then
Line 1035  AC_ARG_ENABLE(bookmarks,     [  --enable Line 1021  AC_ARG_ENABLE(bookmarks,     [  --enable
 AC_ARG_ENABLE(templates,     [  --disable-templates     disables experimental templates support ])  AC_ARG_ENABLE(templates,     [  --disable-templates     disables experimental templates support ])
 AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])  AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])
   
 dnl  AC_ARG_ENABLE([svg],
 dnl plugins support is disabled by default          AC_HELP_STRING([--disable-svg],[disable SVG support]),
 dnl          [case "${enableval}" in
             yes) with_svg="yes" ;;
 if test "$with_plugin" = "" ; then            no)  with_svg="no" ;;
   if test "$enable_plugin" = "yes" ; then            *) AC_MSG_ERROR(bad value ${enableval} for --disable-svg) ;;
     with_plugin="yes"          esac],
   else          [with_svg="yes"])
     with_plugin="no"  
   fi  dnl
 fi    dnl annotations are enabled by default
   dnl
 dnl  AC_ARG_ENABLE([annot],
 dnl svg is enabled by default          AC_HELP_STRING([--disable-annot],[disable Annotations support]),
 dnl          [case "${enableval}" in
 if test "$with_svg" = "" ; then            yes) with_annot="yes" ;;
     if test "$enable_svg" = "no" ; then            no)  with_annot="no" ;;
         with_svg="no"            *) AC_MSG_ERROR(bad value ${enableval} for --disable-annot) ;;
     else          esac],
         with_svg="yes"          [with_annot="yes"])
     fi  
 fi  
   
 dnl  
 dnl annotations is enabled by default  
 dnl  
 if test "$with_annot" = "" ; then  
     if test "$enable_annot" = "no" ; then  
         with_annot="no"  
     else  
         with_annot="yes"  
     fi  
 else  
     with_annot="yes"  
 fi  
   
   
 dnl  dnl
 dnl The redland library is enabled by default  dnl The redland library is enabled by default
 dnl  dnl
 if test "$with_redland" = "" ; then  AC_ARG_ENABLE([redland],
     if test "$enable_redland" = "no" ; then          AC_HELP_STRING([--disable-redland],[disable redland RDF support]),
         with_redland="no"          [case "${enableval}" in
     else            yes) with_redland="yes" ;;
         with_redland="yes"            no)  with_redland="no" ;;
     fi            *) AC_MSG_ERROR(bad value ${enableval} for --disable-redland) ;;
 else          esac],
     with_redland="yes"          [with_redland="yes"])
 fi  
   
 dnl  
 dnl The redland library is disabled by default  
 dnl  
 if test "$with_system_redland" = "" ; then  
     if test "$enable_system_redland" = "yes" ; then  
         with_redland="yes"  
         with_system_redland="yes"  
     else  
         with_system_redland="no"  
     fi  
 else  
     with_system_redland="no"  
 fi  
   
 dnl  dnl
 dnl The bookmarks support is disabled by default  dnl The bookmarks support is disabled by default
 dnl  dnl
 if test "$with_bookmarks" = "" ; then  AC_ARG_ENABLE([bookmarks],
     if test "$enable_bookmarks" = "yes" ; then          AC_HELP_STRING([--enable-bookmarks],[enable experimental bookmark support]),
         with_bookmarks="yes"          [case "${enableval}" in
         with_redland="yes"            yes) with_bookmarks="yes"; with_redland="yes" ;;
     else            no)  with_bookmarks="no" ;;
         with_bookmarks="no"            *) AC_MSG_ERROR(bad value ${enableval} for --enable-bookmarks) ;;
     fi          esac],
 else          [with_bookmarks="no"])
     with_bookmarks="no"  
 fi  
   
 dnl  dnl
 dnl The templates support is enabled by default  dnl The templates support is enabled by default
 dnl  dnl
 if test "$with_templates" = "no " -o "$enable_templates" = "no"; then  AC_ARG_ENABLE([templates],
       with_templates="no"          AC_HELP_STRING([--disable-templates],[disable experimental templates support]),
 else          [case "${enableval}" in
   if test "$with_wx" = "no"; then            yes) with_templates="yes" ;;
       AC_MSG_WARN(Templates are only available in WX version !!)            no)  with_templates="no" ;;
       AC_MSG_WARN(Disabling templates)            *) AC_MSG_ERROR(bad value ${enableval} for --disable-templates) ;;
       with_templates="no"          esac],
    else          [with_templates="yes"])
       with_templates="yes"  
    fi  if test "$with_templates" = yes -a "$with_wx" != "yes"; then
 fi       AC_MSG_WARN(Templates are only available in WX version !!)
       AC_MSG_WARN(Disabling templates)
       with_templates="no"
   fi
   
 if test "$with_templates" = "yes" -o "$with_templates" = "" ; then  if test "$with_templates" = "yes" ; then
     TEMPLATES_OPTIONS="-DTEMPLATES"      TEMPLATES_OPTIONS="-DTEMPLATES"
 else  else
     TEMPLATES_OPTIONS=""      TEMPLATES_OPTIONS=""
Line 1138  fi Line 1094  fi
 dnl  dnl
 dnl Generic XML support enabled by default  dnl Generic XML support enabled by default
 dnl  dnl
 if test "$with_generic_xml" = "" ; then  AC_ARG_ENABLE([generic-xml],
     if test "$enable_generic_xml" = "no" ; then          AC_HELP_STRING([--disable-generic-xml],[disable Generic XML support]),
             with_generic_xml="no"          [case "${enableval}" in
             GENERIC_XML_OPTIONS=            yes) with_generic_xml="yes" ;;
     else            no)  with_generic_xml="no" ;;
             with_generic_xml="yes"            *) AC_MSG_ERROR(bad value ${enableval} for --disable-generic-xml) ;;
             GENERIC_XML_OPTIONS=-DXML_GENERIC          esac],
     fi          [with_generic_xml="yes"])
 fi  
   AC_ARG_ENABLE([system-redland],
           AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),
           [case "${enableval}" in
             yes) with_system_redland="yes"; with_redland="yes" ;;
             no)  with_system_redland="no" ;;
             *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;
           esac],
           [with_system_redland="no"])
   
 dnl  dnl
 dnl WebDAV support enabled by default  dnl WebDAV support enabled by default
Line 1291  if test "$build_amaya" = "yes" ; then Line 1255  if test "$build_amaya" = "yes" ; then
         ANNOTLIB_COMPILE_BM=['#']          ANNOTLIB_COMPILE_BM=['#']
     fi      fi
   
     if test "$with_plugin" = "yes" ; then  
         AC_MSG_WARN(The plugin library isn't supported anymore in Amaya !!)  
         AC_MSG_WARN(Disabling plugin build !)  
         with_plugin="no"  
     fi  
   
   
     if test ! -f $srcdir/davlib/Makefile.in ; then      if test ! -f $srcdir/davlib/Makefile.in ; then
         if test "$with_dav" = "yes" ; then          if test "$with_dav" = "yes" ; then
             AC_MSG_WARN(WebDAV makefile not found !!)              AC_MSG_WARN(WebDAV makefile not found !!)
Line 1323  if test "$with_debug" = "yes" ; then Line 1280  if test "$with_debug" = "yes" ; then
 else  else
   AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS"    AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS"
 fi  fi
 #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"  
 AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS"  AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS"
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
Line 1409  AC_SUBST(VPATHOPT) Line 1365  AC_SUBST(VPATHOPT)
 AC_SUBST(GTK_OPTIONS)  AC_SUBST(GTK_OPTIONS)
 AC_SUBST(THOT_OPTIONS)  AC_SUBST(THOT_OPTIONS)
 AC_SUBST(AMAYA_OPTIONS)  AC_SUBST(AMAYA_OPTIONS)
 AC_SUBST(PLUGIN_OPTIONS)  
 AC_SUBST(AMAYA_ANNOT_OPTIONS)  AC_SUBST(AMAYA_ANNOT_OPTIONS)
 AC_SUBST(AMAYA_ANNOT_INCLUDES)  AC_SUBST(AMAYA_ANNOT_INCLUDES)
 AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)  AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)
Line 1437  dnl Line 1392  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
   
 if test "$with_plugin" = "yes" ; then  
     AC_SUBST_FILE(plugin_frag)  
     plugin_frag=$srcdir/pluginlib/Makefile.plugin  
 else  
     AC_SUBST_FILE(plugin_frag)  
     plugin_frag=/dev/null  
 fi  
   
     AC_SUBST_FILE(www_frag)      AC_SUBST_FILE(www_frag)
     www_frag=$srcdir/amaya/Makefile.libwww      www_frag=$srcdir/amaya/Makefile.libwww
   
Line 1507  make_output="Makefile Options.orig:Optio Line 1454  make_output="Makefile Options.orig:Optio
   
 if test "$build_amaya" = "yes" ; then  if test "$build_amaya" = "yes" ; then
   
     make_output="$make_output amaya/Makefile pluginlib/Makefile"      make_output="$make_output amaya/Makefile"
     EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \      EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \
     $srcdir/amaya/Makefile.libwww"      $srcdir/amaya/Makefile.libwww"
   
     if test "$with_plugin" = "yes" ; then  
        make_output="$make_output pluginlib/Makefile"  
        EXTRA_MAKEFILE_IN="$srcdir/pluginlib/Makefile.in \  
        $srcdir/pluginlib/Makefile.plugin"  
     fi  
   
     if test "$with_annot" = "yes" ; then      if test "$with_annot" = "yes" ; then
        make_output="$make_output annotlib/Makefile"         make_output="$make_output annotlib/Makefile"
        EXTRA_MAKEFILE_IN="$srcdir/annotlib/Makefile.in"         EXTRA_MAKEFILE_IN="$srcdir/annotlib/Makefile.in"
Line 1573  fi Line 1514  fi
 if test "$build_amaya" = "yes" ; then  if test "$build_amaya" = "yes" ; then
     echo Amaya $AMAYA_VER configured      echo Amaya $AMAYA_VER configured
     echo Amaya configured with libWWW      echo Amaya configured with libWWW
     if test "$with_plugin" = "yes" ; then  
         echo Amaya configured with Plugins support  
     fi  
     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
Removed from v.1.207  
changed lines
  Added in v.1.208

Webmaster