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

Diff for /Amaya/configure.in between versions 1.196 and 1.197

version 1.196, 2005/08/30 17:39:59 version 1.197, 2005/11/30 13:41:20
Line 219  if test "$with_gl" = "" ; then Line 219  if test "$with_gl" = "" ; then
   else    else
     with_gl="no"      with_gl="no"
   fi    fi
 fi    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" -o "$enable_gtk" = "yes" ; then
   if test "$withval" = "no" ; then    if test "$withval" = "no" ; then
     with_gtk="no"      with_gtk="no"
       with_wx="yes"
   else    else
     with_gtk="yes"      with_gtk="yes"
     with_wx="no"      with_wx="no"
   fi    fi
 fi  fi
   
   # check if wxWidgets gui should be used
   AC_ARG_WITH(wx, [  --with-wx               use wxWidgets GUI toolkit])
   if test "$with_wx" = "yes" -o "$enable_wx" = "yes" ; then
     if test "$withval" = "no" ; then
       with_wx="no"
     else
       with_wx="yes"
       with_gtk="no"
     fi
   fi
   
   if test "$with_gtk" = "" -o "$with_wx=" = "" ; then
     # Nothing is enable so force the default GUI toolkit (WX)
     with_gtk="no"
     with_wx="yes"
   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
Line 243  if test "$with_mesa" = "" ; then Line 261  if test "$with_mesa" = "" ; then
   fi    fi
 fi  fi
   
 # check if wxWidgets gui should be used  
 AC_ARG_WITH(wx, [  --with-wx               use wxWidgets GUI toolkit (experimental)])  
 if test "$with_wx" = "yes" -o "$enable_wx" = "yes" ; then  
   if test "$withval" = "no" ; then  
     with_wx="no"  
   else  
     with_wx="yes"  
   fi  
 fi  
   
 # Check if at 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" ; then
   if test "$with_gtk" = "no" -o "$with_gtk" = "" ; then    if test "$with_gtk" = "no" ; then
     # Nothing is enable so force the default GUI toolkit (GTK)      # Nothing is enable so force the default GUI toolkit (WX)
     with_wx="no"      with_wx="yes"
     with_gtk="yes"      with_gtk="no"
   fi    fi
 fi  fi
   
 # mesa (software) gl implementation is default with wx (hardware gl implem can be choosen with --with-gl option)  # mesa (software) gl implementation is default with wx (hardware gl implem can be choosen with --with-gl option)
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" -o "$with_wx" = "" ; then
  if test "$AMAYAOS" = "MACOSX" ; then   if test "$AMAYAOS" = "MACOSX" ; then
     with_mesa="no"      with_mesa="no"
     with_gl="yes"      with_gl="yes"
Line 607  fi # with_wx = no Line 616  fi # with_wx = no
   
 # the wx version  # the wx version
 AMAYAWX_MAJVER=9  AMAYAWX_MAJVER=9
 AMAYAWX_MINVER=2  AMAYAWX_MINVER=3
 AMAYAWX_SUBVER=2  AMAYAWX_SUBVER=0
   
 #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=2  AMAYA_SUBVER=3
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
   APP_MAJVER=$AMAYAWX_MAJVER    APP_MAJVER=$AMAYAWX_MAJVER
Line 1086  fi Line 1095  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" = "" ; then  if test "$with_templates" = "yes" -o "$enable_templates" = "yes" ; then
    if test "$enable_templates" = "no" ; then  
       with_templates="no"  
    else  
       with_templates="yes"  
    fi  
 fi   
 if test "$with_templates" = "yes" ; then  
   if test "$with_wx" = "no"; then    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"
      else
         with_templates="yes"
    fi     fi
 fi  fi
   if test "$with_templates" = "no " -o "$enable_templates" = "no"; then
         with_templates="no"
   fi 
   
 if test "$with_templates" = "yes" ; then  if test "$with_templates" = "yes" ; then
     TEMPLATES_OPTIONS="-DTEMPLATES"      TEMPLATES_OPTIONS="-DTEMPLATES"
 else  else
Removed from v.1.196  
changed lines
  Added in v.1.197

Webmaster