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

Diff for /Amaya/configure.in between versions 1.143 and 1.144

version 1.143, 2004/06/14 09:04:37 version 1.144, 2004/06/14 11:06:35
Line 454  if test "$with_wx" = "yes" ; then Line 454  if test "$with_wx" = "yes" ; then
   if test ! -f $WXCONFIG ; then    if test ! -f $WXCONFIG ; then
     AC_MSG_ERROR(Cannot find wx-config. Please download wxWidgets (http://www.wxwidgets.org/))      AC_MSG_ERROR(Cannot find wx-config. Please download wxWidgets (http://www.wxwidgets.org/))
   fi    fi
     
     # setup include paths  
   WX_INCLUDES="`$WXCONFIG $WXCONFIG_ARGS --cxxflags`"    WX_INCLUDES="`$WXCONFIG $WXCONFIG_ARGS --cxxflags`"
   WX_INCLUDES="-I../../wxWidgets/contrib/include/ ${WX_INCLUDES}"    WX_INCLUDES="-I../../wxWidgets/contrib/include/ ${WX_INCLUDES}"
   AC_SUBST(WX_INCLUDES)    AC_SUBST(WX_INCLUDES)
   
   WX_LIBRARIES="-Wl,-rpath,../../wxWidgets/lib `$WXCONFIG $WXCONFIG_ARGS --libs`"    # setup libraries paths
     WX_LIBRARIES=""
     WX_LIBRARIES_EXTRA_PARAM=""
     WXCONFIG_LIBS_PARAM="xrc,html,adv,core,xml"
   # GL is used ?    # GL is used ?
   if test "$with_gl" = "yes" -o "$with_mesa" = "yes" ; then    if test "$with_gl" = "yes" -o "$with_mesa" = "yes" ; then
     WX_LIBRARIES="${WX_LIBRARIES} `$WXCONFIG $WXCONFIG_ARGS --libs=gl`"      WXCONFIG_LIBS_PARAM="${WXCONFIG_LIBS_PARAM},gl"
   
     # SG: this is a mistery why wx-config doesn't add these needed option on macosx      # SG: this is a mistery why wx-config doesn't add these needed option on macosx
     if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then      if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then
       WX_LIBRARIES="${WX_LIBRARIES} -framework OpenGL -framework AGL"        WX_LIBRARIES_EXTRA_PARAM="-framework OpenGL -framework AGL"
     fi      fi
   fi    fi
     WX_LIBRARIES="-Wl,-rpath,../../wxWidgets/lib `$WXCONFIG $WXCONFIG_ARGS --libs=${WXCONFIG_LIBS_PARAM}` ${WX_LIBRARIES_EXTRA_PARAM}"
   # xrc ressources are used  
   WX_LIBRARIES="${WX_LIBRARIES} -l`$WXCONFIG $WXCONFIG_ARGS --basename`_xrc-`$WXCONFIG $WXCONFIG_ARGS --release`"  
   
   AC_SUBST(WX_LIBRARIES)    AC_SUBST(WX_LIBRARIES)
   
   WX_OPTIONS="-D_WX"    WX_OPTIONS="-D_WX"
   # --------- configuring wxWidgets paths - DONE --------------- #    # --------- configuring wxWidgets paths - DONE --------------- #
   
Removed from v.1.143  
changed lines
  Added in v.1.144

Webmaster