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

Diff for /Amaya/configure.in between versions 1.135 and 1.136

version 1.135, 2004/05/14 15:24:38 version 1.136, 2004/05/17 12:20:14
Line 294  if test "$with_nogui" = "yes" -o "$enabl Line 294  if test "$with_nogui" = "yes" -o "$enabl
   NOGUI_OPTIONS="-D_NOGUI"    NOGUI_OPTIONS="-D_NOGUI"
 fi  fi
   
   # check if wxWidgets debug is enable
   AC_ARG_WITH(wxdebug,              [  --with-wxdebug               compiles wxWidgets with debuging options ])
   if test "$with_wxdebug" = "yes" ; then
     with_wxdebug="yes"
   else
     with_wxdebug="no"
   fi
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
   if test "$with_gtk" = "yes" ; then    if test "$with_gtk" = "yes" ; then
     echo       echo 
Line 369  if test "$with_wx" = "yes" ; then Line 377  if test "$with_wx" = "yes" ; then
   echo "---> Configuring wxWidgets library."    echo "---> Configuring wxWidgets library."
   OLDDIR=`pwd`    OLDDIR=`pwd`
   cd ../../wxWidgets/    cd ../../wxWidgets/
   mkdir AMAYABUILD    mkdir -p AMAYABUILD
   cd AMAYABUILD    cd AMAYABUILD
   
   # remove old configure options    # remove old configure options
   rm -f configarg.cache    rm -f configarg.cache
   # launch the configure  
     # setup configure options
   if test "$OS_OPTIONS" = "-D_UNIX" ; then    if test "$OS_OPTIONS" = "-D_UNIX" ; then
     # LINUX      # LINUX
     ../configure --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-debug        WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode"
   fi    fi
   if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then    if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then
     # MACOSX      # MACOSX
     AC_MSG_ERROR(TODO: configurer wxWidgets pour MACOSX)      AC_MSG_ERROR(TODO: configurer wxWidgets pour MACOSX)
     # ../configure --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-debug      # WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode"
     fi
     if test $with_wxdebug = yes ; then
       WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug --enable-debug_cntxt --enable-debug_gdb --enable-debug_info --enable-debug_flag --enable-mem_tracing"
   fi    fi
     
     # launch the configure
     ../configure $WXCONFIGURE_OPTION
   
   echo "---> Configuring wxWidgets library. - DONE"    echo "---> Configuring wxWidgets library. - DONE"
   echo "---> Compiling wxWidgets library."    echo "---> Compiling wxWidgets library."
   # compile the lib    # compile the lib
Line 405  if test "$with_wx" = "yes" ; then Line 422  if test "$with_wx" = "yes" ; then
   fi    fi
       
   WX_INCLUDES="`$WXCONFIG $WXCONFIG_ARGS --cxxflags`"    WX_INCLUDES="`$WXCONFIG $WXCONFIG_ARGS --cxxflags`"
     WX_INCLUDES="-I$WXROOTDIR/contrib/include/ ${WX_INCLUDES}"
   AC_SUBST(WX_INCLUDES)    AC_SUBST(WX_INCLUDES)
   
   WX_LIBRARIES="-Wl,-rpath,$WXROOTDIR `$WXCONFIG $WXCONFIG_ARGS --libs`"    WX_LIBRARIES="-Wl,-rpath,$WXROOTDIR/AMAYABUILD/lib `$WXCONFIG $WXCONFIG_ARGS --libs`"
   
   # GL is used ?    # GL is used ?
   if test "${with_gl}" = "yes" ; then    if test "${with_gl}" = "yes" ; then
Line 421  if test "$with_wx" = "yes" ; then Line 439  if test "$with_wx" = "yes" ; then
   
   # xrc ressources are used    # xrc ressources are used
   WX_LIBRARIES="${WX_LIBRARIES} -l`$WXCONFIG $WXCONFIG_ARGS --basename`_xrc-`wx-config --release`"    WX_LIBRARIES="${WX_LIBRARIES} -l`$WXCONFIG $WXCONFIG_ARGS --basename`_xrc-`wx-config --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 --------------- #
Line 1323  if test "$with_gtk" = "yes" ; then Line 1341  if test "$with_gtk" = "yes" ; then
 fi  fi
   
 if test "$with_wx" = "yes" ; then  if test "$with_wx" = "yes" ; then
     echo "Amaya configured with wxWindows (experimental)"    if test "$with_wxdebug" = "yes" ; then
       echo "Amaya configured with wxWidgets (experimental) [with debug]"
     else
       echo "Amaya configured with wxWidgets (experimental)"
     fi
 fi  fi
   
 if test "$with_nogui" = "yes" ; then  if test "$with_nogui" = "yes" ; then
   echo "Amaya configured without GUI toolkit"    echo "Amaya configured without GUI toolkit"
 fi  fi
     
   
 echo ""  echo ""
 echo "Now type \"make\" (GNU make preferably) to build the binaries"  echo "Now type \"make\" (GNU make preferably) to build the binaries"
 echo ""  echo ""
Removed from v.1.135  
changed lines
  Added in v.1.136

Webmaster