version 1.204, 2006/04/19 15:05:27
|
version 1.205, 2006/06/14 14:17:21
|
Line 243 if test "$with_wx" = "yes" -o "$enable_w
|
Line 243 if test "$with_wx" = "yes" -o "$enable_w
|
with_gtk="no" |
with_gtk="no" |
fi |
fi |
fi |
fi |
|
AC_ARG_ENABLE(system-wx, [ --enable-system-wx try the wxWidgets system library ]) |
if test "$with_gtk" = "" -o "$with_wx=" = "" ; then |
if test "$with_gtk" = "" -o "$with_wx=" = "" ; then |
# Nothing is enable so force the default GUI toolkit (WX) |
# Nothing is enable so force the default GUI toolkit (WX) |
with_gtk="no" |
with_gtk="no" |
Line 251 if test "$with_gtk" = "" -o "$with_wx="
|
Line 251 if test "$with_gtk" = "" -o "$with_wx="
|
fi |
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 |
if test "$enable_mesa" = "yes" ; then |
if test "$enable_mesa" = "yes" ; then |
with_mesa="yes" |
with_mesa="yes" |
Line 420 if test "$with_mesa" = "yes" ; then
|
Line 420 if test "$with_mesa" = "yes" ; then
|
fi |
fi |
|
|
if test "$with_wx" = "yes" ; then |
if test "$with_wx" = "yes" ; then |
# WX_SRCDIR is better to understand the code than with_wxsrcdir variable |
if test "$enable_system_wx" = "yes"; then |
if test ! -f $with_wxsrcdir/Makefile.in ; then |
AC_PATH_PROG(WXCONFIG, wx-config) |
$with_wxsrcdir = ../../wxWidgets |
if test -z "$WXCONFIG"; then |
fi |
enable_system_wx="no" |
cd $with_wxsrcdir |
fi |
WX_SRCDIR=`pwd` |
|
cd - |
|
AC_SUBST(WX_SRCDIR) |
|
|
|
# check that sources of wxWidgets exists |
|
if test ! -f $WX_SRCDIR/Makefile.in ; then |
|
AC_MSG_ERROR(wxWidgets library sources not found. Please download wxWidgets sources (http://www.wxwidgets.org/), or remove --with-wx option, or check --with-wxsrcdir is correct !) |
|
fi |
fi |
|
|
|
if test "$enable_system_wx" != "yes"; then |
|
# WX_SRCDIR is better to understand the code than with_wxsrcdir variable |
|
if test ! -f $with_wxsrcdir/Makefile.in ; then |
|
$with_wxsrcdir = ../../wxWidgets |
|
fi |
|
cd $with_wxsrcdir |
|
WX_SRCDIR=`pwd` |
|
cd - |
|
AC_SUBST(WX_SRCDIR) |
|
|
|
# check that sources of wxWidgets exists |
|
if test ! -f $WX_SRCDIR/Makefile.in ; then |
|
AC_MSG_ERROR(wxWidgets library sources not found. Please download wxWidgets sources (http://www.wxwidgets.org/), or remove --with-wx option, or check --with-wxsrcdir is correct !) |
|
fi |
|
|
# --------- configure wxWidgets library --------------- # |
# --------- configure wxWidgets library --------------- # |
echo "---> Configuring wxWidgets library." |
echo "---> Configuring wxWidgets library." |
Line 443 if test "$with_wx" = "yes" ; then
|
Line 451 if test "$with_wx" = "yes" ; then
|
else |
else |
WX_BUILDDIR="wxWidgets_RELEASE" |
WX_BUILDDIR="wxWidgets_RELEASE" |
fi |
fi |
|
|
mkdir -p $WX_BUILDDIR |
mkdir -p $WX_BUILDDIR |
cd $WX_BUILDDIR |
cd $WX_BUILDDIR |
AC_SUBST(WX_BUILDDIR) |
AC_SUBST(WX_BUILDDIR) |
Line 472 if test "$with_wx" = "yes" ; then
|
Line 481 if test "$with_wx" = "yes" ; then
|
# --enable-unicode compile wxString with Unicode support |
# --enable-unicode compile wxString with Unicode support |
# --with-gtk use GTK+ |
# --with-gtk use GTK+ |
# --with-opengl use OpenGL (or Mesa) |
# --with-opengl use OpenGL (or Mesa) |
WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin $WXCONFIGURE_TUNNING_OPTION" |
WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin $WXCONFIGURE_TUNNING_OPTION" |
fi |
fi |
if test "$AMAYAOS" = "MACOSX" ; then |
if test "$AMAYAOS" = "MACOSX" ; then |
# MACOSX |
# MACOSX |
Line 511 if test "$with_wx" = "yes" ; then
|
Line 520 if test "$with_wx" = "yes" ; then
|
|
|
# setup include paths |
# setup include paths |
# "-I$WX_SRCDIR/src/png -I$WX_SRCDIR/src/jpeg -I$WX_SRCDIR/src/tiff" is a temporary patch to fix incorrect generated paths by wx-config --cxxflags (remove it when wxWidgets will be fixed) |
# "-I$WX_SRCDIR/src/png -I$WX_SRCDIR/src/jpeg -I$WX_SRCDIR/src/tiff" is a temporary patch to fix incorrect generated paths by wx-config --cxxflags (remove it when wxWidgets will be fixed) |
WX_INCLUDES="-I$WX_SRCDIR/src/png -I$WX_SRCDIR/src/jpeg -I$WX_SRCDIR/src/tiff `$WXCONFIG --cxxflags`" |
WX_INCLUDES="-I$WX_SRCDIR/src/png -I$WX_SRCDIR/src/jpeg -I$WX_SRCDIR/src/tiff" |
|
|
|
BUILDWXWIDGETS="wxwidgets" |
|
AC_SUBST(BUILDWXWIDGETS) |
|
|
|
fi |
|
|
|
WX_INCLUDES="$WX_INCLUDES `$WXCONFIG --cxxflags`" |
|
|
AC_SUBST(WX_INCLUDES) |
AC_SUBST(WX_INCLUDES) |
|
|
# setup libraries paths |
# setup libraries paths |
Line 616 fi # with_wx = no
|
Line 633 fi # with_wx = no
|
|
|
# the wx version |
# the wx version |
AMAYAWX_MAJVER=9 |
AMAYAWX_MAJVER=9 |
AMAYAWX_MINVER=51 |
AMAYAWX_MINVER=52 |
AMAYAWX_SUBVER=0 |
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=52 |
AMAYA_SUBVER=51 |
AMAYA_SUBVER=0 |
|
|
if test "$with_wx" = "yes" ; then |
if test "$with_wx" = "yes" ; then |
APP_MAJVER=$AMAYAWX_MAJVER |
APP_MAJVER=$AMAYAWX_MAJVER |
Line 1502 if test "$build_amaya" = "yes" ; then
|
Line 1519 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" ; then |
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" |
EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN $WX_SRCDIR/Makefile.in $WX_SRCDIR/configure.in" |
fi |
fi |
|
|