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

Diff for /Amaya/configure.in between versions 1.174 and 1.175

version 1.174, 2005/04/05 16:24:00 version 1.175, 2005/04/22 08:10:25
Line 190  esac Line 190  esac
   
 AC_ARG_WITH(GL,              [  --with-gl               enable Opengl canvas (experimental) ])  AC_ARG_WITH(GL,              [  --with-gl               enable Opengl canvas (experimental) ])
 dnl  dnl
 dnl GL canvas is disabled by default  dnl GL canvas is disabled by default in 8.7.x
 dnl  dnl GL canvas is enabled by default in 9.x
 dnl needs Opengl, glu, Xft (xfree 4 font server)  dnl - 8.7.x needs : GL, GLX, GLU, freetype2, gtkgl
 dnl needs GTK  dnl - 9.x needs : GL, GLX, GLU, freetype2, wxGLCanvas
 dnl text WILL need freetype2, ftgl  
 dnl GL is for opengl  dnl GL is for opengl
 dnl Glu is for text drawing (until we switch)   dnl GlX is for XWindow integration
 dnl GLU is for tesselation algortihms (until we extract it from this lib)  dnl GLU is for tesselation algortihms (until we extract it from this lib)
 dnl (tesselation is used for polygons with holes in it...)  dnl (tesselation is used for polygons with holes in it...)
 dnl gtkgl is for integration of opengl in GTK  dnl gtkgl is for integration of opengl in GTK
   dnl freetype2 is for text drawing (fonts ...)
   dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)
 if test "$with_gl" = "" ; then  if test "$with_gl" = "" ; then
  if test "$enable_gl" = "yes" ; then   if test "$enable_gl" = "yes" ; then
     with_gl="yes"      with_gl="yes"
Line 229  if test "$with_mac" = "" ; then Line 230  if test "$with_mac" = "" ; then
 fi  fi
   
 # check for mesa library (OpenGL)  # check for mesa library (OpenGL)
 AC_ARG_WITH(MESA,              [  --with-mesa             enable OpenGL canvas with internal MesaLib (only used with wxWidgets GUI) ])  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   if test "$enable_mesa" = "yes" ; then
     with_mesa="yes"      with_mesa="yes"
Line 246  if test "$with_wx" = "yes" -o "$enable_w Line 247  if test "$with_wx" = "yes" -o "$enable_w
     with_wx="no"      with_wx="no"
   else    else
     with_wx="yes"      with_wx="yes"
     # force mesa or opengl with wxWidgets (mesa is used in priority)  
     if test "$with_gl" = "no" ; then  
       with_mesa="yes"  
     fi  
   fi    fi
 fi  fi
   
 # Check if iat least one GUI toolkit is enabled  # Check if at least one GUI toolkit is enabled
 if test "$with_wx" = "no" -o "$with_wx" = "" ; then  if test "$with_wx" = "no" -o "$with_wx" = "" ; then
   if test "$with_gtk" = "no" -o "$with_gtk" = "" ; then    if test "$with_gtk" = "no" -o "$with_gtk" = "" ; then
     # Nothing is enable so force the default GUI toolkit (GTK)      # Nothing is enable so force the default GUI toolkit (GTK)
Line 262  if test "$with_wx" = "no" -o "$with_wx" Line 259  if test "$with_wx" = "no" -o "$with_wx"
   fi    fi
 fi  fi
   
   # hardware gl implementation is default with wxWidgets (mesa is can be choosen if necessary)
   if test "$with_wx" = "yes" ; then
     if test "$with_mesa" = "no" ; then
       with_gl="yes"
     fi
   fi
   
 # check if no gui is enable  # check if no gui is enable
 AC_ARG_WITH(nogui, [  --with-nogui            do not use GUI toolkit ])  AC_ARG_WITH(nogui, [  --with-nogui            do not use GUI toolkit (not maintained) ])
 if test "$with_nogui" = "yes" -o "$enable_nogui" = "yes" ; then  if test "$with_nogui" = "yes" -o "$enable_nogui" = "yes" ; then
   with_nogui="yes"    with_nogui="yes"
   with_gtk="no"    with_gtk="no"
Removed from v.1.174  
changed lines
  Added in v.1.175

Webmaster