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

Diff for /Amaya/configure.in between versions 1.217 and 1.218

version 1.217, 2007/02/27 08:48:23 version 1.218, 2007/02/27 14:54:52
Line 213  dnl gtkgl is for integration of opengl i Line 213  dnl gtkgl is for integration of opengl i
 dnl freetype2 is for text drawing (fonts ...)  dnl freetype2 is for text drawing (fonts ...)
 dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)  dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)
 AC_ARG_WITH([gl],  AC_ARG_WITH([gl],
    AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]),     AC_HELP_STRING([--with-gl],[enable canvas with hardware OpenGL implementation]),
    [case "${withval}" in     [case "${withval}" in
           yes) with_gl="yes" ;;            yes) with_gl="yes" ;;
           no)  with_gl="no" ;;            no)  with_gl="no" ;;
Line 222  AC_ARG_WITH([gl], Line 222  AC_ARG_WITH([gl],
         [with_gl="no"])          [with_gl="no"])
   
 # 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, [ ])
 if test "$with_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"
Line 234  if test "$with_gtk" = "yes" ; then Line 234  if test "$with_gtk" = "yes" ; then
 fi  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, [ ])
 if test "$with_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"
Line 243  if test "$with_wx" = "yes" ; then Line 243  if test "$with_wx" = "yes" ; then
     with_gtk="no"      with_gtk="no"
   fi    fi
 fi  fi
 AC_ARG_ENABLE(system-wx,       [  --enable-system-wx try the wxWidgets system library ])  AC_ARG_ENABLE(system-wx,       [  --enable-system-wx      try the wxWidgets system library ])
 if test "$with_gtk" = "" -o "$with_wx=" = "" ; then  if test "$with_gtk" = "" -o "$with_wx=" = "" ; then
   # Nothing is enable so force the default GUI toolkit (WX)    # Nothing is enable so force the default GUI toolkit (WX)
   with_gtk="no"    with_gtk="no"
Line 251  if test "$with_gtk" = "" -o "$with_wx=" Line 251  if test "$with_gtk" = "" -o "$with_wx="
 fi  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 (default) ])
 if test "$with_mesa" = "" ; then  if test "$with_mesa" = "" ; then
   with_mesa="no"    with_mesa="no"
 fi  fi
Line 665  CEXTRACT_VER="1.7" Line 665  CEXTRACT_VER="1.7"
 CEXTRACT_FLAGS="+O"  CEXTRACT_FLAGS="+O"
   
 # Check if debug is enable  # Check if debug is enable
 AC_ARG_WITH(debug,              [  --with-debug          compiles Amaya with debuging options (-g) ])  AC_ARG_WITH(debug,              [  --with-debug            compiles Amaya with debuging options (-g) ])
 if test "$with_debug" = "yes" ; then  if test "$with_debug" = "yes" ; then
   with_debug="yes"    with_debug="yes"
   CFLAGS="-g"    CFLAGS="-g"
Line 1005  AC_ARG_ENABLE([svg], Line 1005  AC_ARG_ENABLE([svg],
         esac],          esac],
         [with_svg="yes"])          [with_svg="yes"])
   
 ##########################Annotations and Bookmarks Support####################  ##########################Annotations Support####################
 dnl  dnl
 dnl annotations are enabled by default  dnl annotations are enabled by default
 dnl  dnl
Line 1018  AC_ARG_ENABLE([annot], Line 1018  AC_ARG_ENABLE([annot],
         esac],          esac],
         [with_annot="yes"])          [with_annot="yes"])
   
 dnl  
 dnl The bookmarks support is disabled by default  
 dnl  
 AC_ARG_ENABLE([bookmarks],  
         AC_HELP_STRING([--enable-bookmarks],[enable experimental bookmark support]),  
         [case "${enableval}" in  
           yes) with_bookmarks="yes" ;;  
           no)  with_bookmarks="no" ;;  
           *) AC_MSG_ERROR(bad value ${enableval} for --enable-bookmarks) ;;  
         esac],  
         [with_bookmarks="no"])  
   
 #if the directory containing Annotlib  
 #and Bookmarks is not present,  
 #don't try to build them  
 if test ! -f $srcdir/annotlib/Makefile.in ; then  
         AC_MSG_WARN(Annotation makefile not found !!)  
         AC_MSG_WARN(Disabling Annotations build !)  
         with_annot="no"  
         with_bookmarks="no"  
 fi  
   
 if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then  #annot need Redland
    AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)  if test "$with_annot" = "yes" ; then
    with_bookmarks="no"  
 fi  
   
 #annot and bookmarks need Redland  
 if test "$with_annot" = "yes" -o "$with_bookmarks" = "yes" ; then  
         with_redland="yes"          with_redland="yes"
 else  else
         with_redland="no"          with_redland="no"
Line 1113  fi Line 1087  fi
   
 #At this point, we know everything about Redland,  #At this point, we know everything about Redland,
 #so either set the variables we will need later,  #so either set the variables we will need later,
 #ot disable Annotations and Bookmarks  #or disable Annotations
 if test "$with_redland" = "yes" ; then  if test "$with_redland" = "yes" ; then
         AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"          AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"
         if test "$with_system_redland" != "yes" ; then          if test "$with_system_redland" != "yes" ; then
Line 1133  if test "$with_redland" = "yes" ; then Line 1107  if test "$with_redland" = "yes" ; then
        fi         fi
 else  else
         with_annot="no"          with_annot="no"
         with_bookmarks="no"  
 fi  fi
   
 #Bookmarks require some specific flags  ANNOTLIB_COMPILE_BM=['#']
 if test "$with_bookmarks" = "yes" ; then  
         ANNOTLIB_COMPILE_BM=  
         AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"  
 else  
         ANNOTLIB_COMPILE_BM=['#']  
 fi  
   
 ###################End of Annotations and Bookmarks Support####################  ###################End of Annotations Support####################
   
   
 dnl  dnl
Line 1193  fi Line 1160  fi
 dnl  dnl
 dnl WebDAV support enabled by default  dnl WebDAV support enabled by default
 dnl  dnl
 AC_ARG_WITH(dav,            [  --with-dav              enable WebDAV support (experimental) ])  AC_ARG_WITH(dav,            [  --with-dav              enable WebDAV support (default) ])
 if test "$with_dav" = "" ; then  if test "$with_dav" = "" ; then
   with_dav="yes"    with_dav="yes"
 fi  fi
Line 1509  if test "$build_amaya" = "yes" ; then Line 1476  if test "$build_amaya" = "yes" ; then
           echo Amaya configured with the Redland RDF library \(system\)            echo Amaya configured with the Redland RDF library \(system\)
         fi          fi
     fi      fi
     if test "$with_bookmarks" = "yes" ; then  
         echo Amaya configured with bookmarks support \(experimental\)  
     fi  
     if test "$with_templates" = "yes" ; then      if test "$with_templates" = "yes" ; then
         echo Amaya configured with templates support \(experimental\)          echo Amaya configured with templates support \(experimental\)
     fi      fi
Removed from v.1.217  
changed lines
  Added in v.1.218

Webmaster