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

Diff for /Amaya/configure.in between versions 1.239 and 1.240

version 1.239, 2008/07/08 13:34:17 version 1.240, 2008/07/09 11:11:38
Line 212  dnl freetype2 is for text drawing (fonts Line 212  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)
   
 with_wx="yes"  with_wx="yes"
 AC_ARG_ENABLE(system-wx,       [  --enable-system-wx      try the wxWidgets system library ])  
   AC_ARG_ENABLE([system-wx],
       AC_HELP_STRING([--enable-system-wx],[try the wxWidgets system library]),
       [case "${enableval}" in
         yes) with_system_wx="yes";;
         no)  with_system_wx="no" ;;
         *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-wx) ;;
       esac],
       [with_system_wx="no"])
   
   
   
 AC_ARG_WITH([gl],  AC_ARG_WITH([gl],
    AC_HELP_STRING([--with-gl],[enable canvas with hardware OpenGL implementation]),     AC_HELP_STRING([--with-gl],[enable canvas with hardware OpenGL implementation]),
Line 288  if test "$with_mesa" = "yes" ; then Line 298  if test "$with_mesa" = "yes" ; then
   AC_SUBST(GL_LIBRARIES)    AC_SUBST(GL_LIBRARIES)
 fi  fi
   
 if test "$enable_system_wx" = "yes"; then  if test "$with_system_wx" = "yes"; then
   AC_PATH_PROG(WXCONFIG, wx-config)    AC_PATH_PROG(WXCONFIG, wx-config)
   if test -z "$WXCONFIG"; then    if test -z "$WXCONFIG"; then
     enable_system_wx="no"      with_system_wx="no"
   fi    fi
 fi  fi
       
 if test "$enable_system_wx" != "yes"; then  if test "$with_system_wx" != "yes"; then
   # WX_SRCDIR is better to understand the code than with_wxsrcdir variable    # WX_SRCDIR is better to understand the code than with_wxsrcdir variable
   if test ! -f $with_wxsrcdir/Makefile.in ; then    if test ! -f $with_wxsrcdir/Makefile.in ; then
     $with_wxsrcdir = ../../wxWidgets      $with_wxsrcdir = ../../wxWidgets
Line 390  if test "$enable_system_wx" != "yes"; th Line 400  if test "$enable_system_wx" != "yes"; th
   BUILDWXWIDGETS="wxwidgets"    BUILDWXWIDGETS="wxwidgets"
   AC_SUBST(BUILDWXWIDGETS)    AC_SUBST(BUILDWXWIDGETS)
   
 fi #!$enable_system_wx  fi #!$with_system_wx
   
 WX_INCLUDES="$WX_INCLUDES `$WXCONFIG --cxxflags`"  WX_INCLUDES="$WX_INCLUDES `$WXCONFIG --cxxflags`"
 AC_SUBST(WX_INCLUDES)  AC_SUBST(WX_INCLUDES)
Line 1092  if test "$build_amaya" = "yes" ; then Line 1102  if test "$build_amaya" = "yes" ; then
        EXTRA_MAKEFILE_IN="$srcdir/davlib/Makefile.in"         EXTRA_MAKEFILE_IN="$srcdir/davlib/Makefile.in"
     fi      fi
   
     if test "$with_wx" = "yes" -a "enable_system_wx" = "yes" ; then  
        EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN $WX_SRCDIR/Makefile.in $WX_SRCDIR/configure.in"  
     fi  
   
 fi  fi
   
 dnl  dnl
Removed from v.1.239  
changed lines
  Added in v.1.240

Webmaster