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

Diff for /Amaya/configure.in between versions 1.193 and 1.194

version 1.193, 2005/07/20 14:52:17 version 1.194, 2005/08/18 09:35:28
Line 607  fi # with_wx = no Line 607  fi # with_wx = no
 # the wx version  # the wx version
 AMAYAWX_MAJVER=9  AMAYAWX_MAJVER=9
 AMAYAWX_MINVER=2  AMAYAWX_MINVER=2
 AMAYAWX_SUBVER=1  AMAYAWX_SUBVER=2
   
 #the old version (to remove when switching on wx)  #the old version (to remove when switching on wx)
 AMAYA_MAJVER=8  AMAYA_MAJVER=8
 AMAYA_MINVER=8  AMAYA_MINVER=8
 AMAYA_SUBVER=1  AMAYA_SUBVER=2
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
   APP_MAJVER=$AMAYAWX_MAJVER    APP_MAJVER=$AMAYAWX_MAJVER
Line 1001  AC_ARG_ENABLE(annot,         [  --disabl Line 1001  AC_ARG_ENABLE(annot,         [  --disabl
 AC_ARG_ENABLE(redland,       [  --disable-redland       disable the redland RDF library ])  AC_ARG_ENABLE(redland,       [  --disable-redland       disable the redland RDF library ])
 AC_ARG_ENABLE(system-redland,       [  --enable-system-redland try the redland RDF system library ])  AC_ARG_ENABLE(system-redland,       [  --enable-system-redland try the redland RDF system library ])
 AC_ARG_ENABLE(bookmarks,     [  --enable-bookmarks      enables experimental bookmark support ])  AC_ARG_ENABLE(bookmarks,     [  --enable-bookmarks      enables experimental bookmark support ])
 AC_ARG_ENABLE(templates,     [  --enable-templates      enables 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  dnl
Line 1083  else Line 1083  else
 fi  fi
   
 dnl  dnl
 dnl The templates support is disabled by default  dnl The templates support is enabled by default
 dnl  dnl
 if test "$with_templates" = "" ; then  if test "$with_templates" = "" ; then
    if test "$with_wx" = "yes"; then     if test "$enable_templates" = "no" ; then
        if test "$enable_templates" = "yes" ; then        with_templates="no"
      else
           with_templates="yes"            with_templates="yes"
        else     fi
           with_templates="no"  fi 
        fi  if test "$with_templates" = "yes" ; then
    else     if test "$with_wx" = "no"; then
       AC_MSG_WARN(Templates are only available in WX version !!)        AC_MSG_WARN(Templates are only available in WX version !!)
       AC_MSG_WARN(Disabling templates)        AC_MSG_WARN(Disabling templates)
       with_templates="no"        with_templates="no"
    fi     fi
   fi
   if test "$with_templates" = "yes" ; then
       TEMPLATES_OPTIONS="-DTEMPLATES"
 else  else
     with_templates="no"      TEMPLATES_OPTIONS=""
 fi  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  if test "$with_generic_xml" = "" ; then
     if test "$enable_generic_xml" = "no" ; then      if test "$enable_generic_xml" = "no" ; then
         with_generic_xml="no"              with_generic_xml="no"
         GENERIC_XML_OPTIONS=              GENERIC_XML_OPTIONS=
     else      else
         with_generic_xml="yes"              with_generic_xml="yes"
         GENERIC_XML_OPTIONS=-DXML_GENERIC              GENERIC_XML_OPTIONS=-DXML_GENERIC
     fi      fi
 fi  fi
   
Line 1251  if test "$build_amaya" = "yes" ; then Line 1256  if test "$build_amaya" = "yes" ; then
        with_bookmarks="no"         with_bookmarks="no"
     fi      fi
     if test "$with_bookmarks" = "yes" ; then      if test "$with_bookmarks" = "yes" ; then
         ANNOTLIB_COMPILE_BM=          ANNOTLIB_COMPILE_BM=
         AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"          AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"
     else      else
         ANNOTLIB_COMPILE_BM=['#']          ANNOTLIB_COMPILE_BM=['#']
     fi  
   
     if test "$with_templates" = "yes" ; then  
         TEMPLATES_OPTIONS=   
     fi      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 !)
         with_plugin="no"          with_plugin="no"
     fi      fi
   
   
Removed from v.1.193  
changed lines
  Added in v.1.194

Webmaster