version 1.152, 2004/10/01 14:12:27
|
version 1.153, 2004/10/21 15:12:01
|
Line 268 else
|
Line 268 else
|
with_wxdebug="no" |
with_wxdebug="no" |
fi |
fi |
|
|
|
# it is possible to specify wxWidgets library path, |
|
# usefull for developpers who want to compile amaya with different wxWidgets version |
|
AC_ARG_WITH(wxsrcdir, [ --with-wxsrcdir=... compiles Amaya with a specific wxWidgets sources path ]) |
|
if test "$with_wxsrcdir" = "" ; then |
|
with_wxsrcdir="../../wxWidgets" |
|
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 401 if test "$with_mesa" = "yes" ; then
|
Line 409 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 |
|
WX_SRCDIR=$with_wxsrcdir |
|
AC_SUBST(WX_SRCDIR) |
|
|
# check that sources of wxWidgets exists |
# check that sources of wxWidgets exists |
if test ! -f ../../wxWidgets/Makefile.in ; then |
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 !) |
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 |
|
|
# --------- configure wxWidgets library --------------- # |
# --------- configure wxWidgets library --------------- # |
Line 453 if test "$with_wx" = "yes" ; then
|
Line 464 if test "$with_wx" = "yes" ; then
|
# launch the configure |
# launch the configure |
if test "$with_mesa" = "yes" ; then |
if test "$with_mesa" = "yes" ; then |
# use internal OpenGL (mesa) libraries |
# use internal OpenGL (mesa) libraries |
../../../wxWidgets/configure CFLAGS="-I${GL_BUILDDIR}/include" CXXFLAGS="-I${GL_BUILDDIR}/include" CPPFLAGS="-I${GL_BUILDDIR}/include" OPENGL_LIBS="-lGL -lGLU" $WXCONFIGURE_OPTION |
../$WX_SRCDIR/configure CFLAGS="-I${GL_BUILDDIR}/include" CXXFLAGS="-I${GL_BUILDDIR}/include" CPPFLAGS="-I${GL_BUILDDIR}/include" OPENGL_LIBS="-lGL -lGLU" $WXCONFIGURE_OPTION |
if test $? != 0 ; then |
if test $? != 0 ; then |
AC_MSG_ERROR(A problem occurs durring wxWidgets library configuration. Please fix the problem and try again.) |
AC_MSG_ERROR(A problem occurs durring wxWidgets library configuration. Please fix the problem and try again.) |
fi |
fi |
else |
else |
# use OpenGL system libraries |
# use OpenGL system libraries |
../../../wxWidgets/configure $WXCONFIGURE_OPTION |
../$WX_SRCDIR/configure $WXCONFIGURE_OPTION |
fi |
fi |
cd $OLDDIR |
cd $OLDDIR |
echo "---> Configuring wxWidgets library. - DONE" |
echo "---> Configuring wxWidgets library. - DONE" |
Line 488 if test "$with_wx" = "yes" ; then
|
Line 499 if test "$with_wx" = "yes" ; then
|
fi |
fi |
fi |
fi |
WX_LIBRARIES="`$WXCONFIG --libs $WXCONFIG_LIBS_PARAM` ${WX_LIBRARIES_EXTRA_PARAM}" |
WX_LIBRARIES="`$WXCONFIG --libs $WXCONFIG_LIBS_PARAM` ${WX_LIBRARIES_EXTRA_PARAM}" |
# WX_LIBRARIES="`$WXCONFIG --libs=$WXCONFIG_LIBS_PARAM` ${WX_LIBRARIES_EXTRA_PARAM}" |
|
AC_SUBST(WX_LIBRARIES) |
AC_SUBST(WX_LIBRARIES) |
|
|
WX_OPTIONS="-D_WX" |
WX_OPTIONS="-D_WX" |
Line 1371 fi
|
Line 1381 fi
|
|
|
if test "$with_wx" = "yes" ; then |
if test "$with_wx" = "yes" ; then |
if test "$with_wxdebug" = "yes" ; then |
if test "$with_wxdebug" = "yes" ; then |
echo "Amaya configured with wxWidgets (experimental) [with debug]" |
echo "Amaya configured with wxWidgets {srcdir=$WX_SRCDIR} (debug) (experimental)" |
else |
else |
echo "Amaya configured with wxWidgets (experimental)" |
echo "Amaya configured with wxWidgets {srcdir=$WX_SRCDIR} (experimental)" |
fi |
fi |
fi |
fi |
|
|