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

Diff for /Amaya/configure.in between versions 1.148 and 1.149

version 1.148, 2004/06/28 13:51:40 version 1.149, 2004/06/29 08:25:51
Line 388  if test "$with_wx" = "yes" ; then Line 388  if test "$with_wx" = "yes" ; then
   # --------- compile wxWidgets library --------------- #    # --------- compile wxWidgets library --------------- #
   echo "---> Configuring wxWidgets library."    echo "---> Configuring wxWidgets library."
   OLDDIR=`pwd`    OLDDIR=`pwd`
     # create the build directory (debug or release)
   cd ../../wxWidgets/    cd ../../wxWidgets/
   mkdir -p AMAYABUILD    if test $with_wxdebug = yes ; then
   cd AMAYABUILD      WXBUILD_DIR="AMAYABUILD_DEBUG"
     else
       WXBUILD_DIR="AMAYABUILD_RELEASE"
     fi
     mkdir -p $WXBUILD_DIR
     cd $WXBUILD_DIR
   
   # remove old configure options    # remove old configure cached options
   rm -f configarg.cache    rm -f configarg.cache
   
   # setup configure options    # setup configure options
Line 453  if test "$with_wx" = "yes" ; then Line 459  if test "$with_wx" = "yes" ; then
   echo "---> Install wxWidgets library into Amaya."    echo "---> Install wxWidgets library into Amaya."
   OLDDIR=$(pwd)    OLDDIR=$(pwd)
   cd ../../wxWidgets    cd ../../wxWidgets
   mkdir -p $OLDDIR/../wxWidgets    # create destination directories
   mkdir -p $OLDDIR/../wxWidgets/include    if test $with_wxdebug = yes ; then
   mkdir -p $OLDDIR/../wxWidgets/contrib      WXAMAYA_DIR="wxWidgets_debug"
   mkdir -p $OLDDIR/../wxWidgets/contrib/include    else
   mkdir -p $OLDDIR/../wxWidgets/lib      WXAMAYA_DIR="wxWidgets_release"
     fi
     mkdir -p $OLDDIR/../$WXAMAYA_DIR
     mkdir -p $OLDDIR/../$WXAMAYA_DIR/include
     mkdir -p $OLDDIR/../$WXAMAYA_DIR/contrib
     mkdir -p $OLDDIR/../$WXAMAYA_DIR/contrib/include
     mkdir -p $OLDDIR/../$WXAMAYA_DIR/lib
     # remove old lib
     rm -rf $OLDDIR/../$WXAMAYA_DIR/lib/*
   # copy includes    # copy includes
   cp -r include/* $OLDDIR/../wxWidgets/include/    cp -r include/* $OLDDIR/../$WXAMAYA_DIR/include/
   cp -r contrib/include/* $OLDDIR/../wxWidgets/contrib/include/    cp -r contrib/include/* $OLDDIR/../$WXAMAYA_DIR/contrib/include/
   cp -r AMAYABUILD/lib/wx $OLDDIR/../wxWidgets/lib/    cp -r $WXBUILD_DIR/lib/wx $OLDDIR/../$WXAMAYA_DIR/lib/
   # copy libraries (only .a because we dont want to share)    # copy libraries (only .a because we dont want to share)
   cp -pd AMAYABUILD/lib/*.a $OLDDIR/../wxWidgets/lib/    cp -pd $WXBUILD_DIR/lib/*.a $OLDDIR/../$WXAMAYA_DIR/lib/
   # copy autoconfig script (needed to setup 'Option' file)    # copy autoconfig script (needed to setup 'Option' file)
   cp -pd AMAYABUILD/*-config $OLDDIR/../wxWidgets/    cp -pd $WXBUILD_DIR/*-config $OLDDIR/../$WXAMAYA_DIR/
   cd $OLDDIR    cd $OLDDIR
   echo "---> Install wxWidgets library into Amaya. - DONE"    echo "---> Install wxWidgets library into Amaya. - DONE"
   # --------- install wxWidgets library - DONE --------------- #    # --------- install wxWidgets library - DONE --------------- #
   
   
   # --------- configuring wxWidgets paths --------------- #    # --------- configuring wxWidgets paths --------------- #
   WXCONFIG=../wxWidgets/wx-config    WXCONFIG=../$WXAMAYA_DIR/wx-config
   # look for relative wxWidgets path : necessary to install into different paths amaya    # look for relative wxWidgets path : necessary to install into different paths amaya
   WXCONFIG_ARGS="--prefix=../../wxWidgets --exec-prefix=../../wxWidgets"    WXCONFIG_ARGS="--prefix=../../$WXAMAYA_DIR --exec-prefix=../../$WXAMAYA_DIR"
   # check that wx-config exists    # check that wx-config exists
   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/))
Line 482  if test "$with_wx" = "yes" ; then Line 496  if test "$with_wx" = "yes" ; then
   
   # setup include paths      # 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../../$WXAMAYA_DIR/contrib/include/ ${WX_INCLUDES}"
   AC_SUBST(WX_INCLUDES)    AC_SUBST(WX_INCLUDES)
   
   # setup libraries paths    # setup libraries paths
Line 497  if test "$with_wx" = "yes" ; then Line 511  if test "$with_wx" = "yes" ; then
       WX_LIBRARIES_EXTRA_PARAM="-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}"    WX_LIBRARIES="-Wl,-rpath,../../$WXAMAYA_DIR/lib `$WXCONFIG $WXCONFIG_ARGS --libs=${WXCONFIG_LIBS_PARAM}` ${WX_LIBRARIES_EXTRA_PARAM}"
   AC_SUBST(WX_LIBRARIES)    AC_SUBST(WX_LIBRARIES)
   
   WX_OPTIONS="-D_WX"    WX_OPTIONS="-D_WX"
Removed from v.1.148  
changed lines
  Added in v.1.149

Webmaster