version 1.157, 2005/02/02 11:16:02
|
version 1.158, 2005/02/02 14:45:15
|
Line 445 if test "$with_wx" = "yes" ; then
|
Line 445 if test "$with_wx" = "yes" ; then
|
rm -f configarg.cache |
rm -f configarg.cache |
|
|
# setup configure options |
# setup configure options |
|
|
|
# disable unused wx features |
|
# --disable-htmlhelp |
|
# --disable-html |
|
# --disable-docview |
|
# --disable-mdi |
|
# --disable-mdidoc |
|
# --disable-protocols |
|
# --disable-ftp |
|
# --disable-http |
|
# --disable-sound |
|
WXCONFIGURE_TUNNING_OPTION="--disable-htmlhelp --disable-html --disable-docview --disable-mdi --disable-mdidoc --disable-protocols --disable-ftp --disable-http --disable-sound" |
|
|
if test "$OS_OPTIONS" = "-D_UNIX" ; then |
if test "$OS_OPTIONS" = "-D_UNIX" ; then |
# LINUX |
# LINUX |
# --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL) |
# --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL) |
# --enable-shared create shared library code |
# --disable-shared create only static library (.a) |
# --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) |
# --with-xrc use XRC resources system |
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" |
# --disable-htmlhelp |
|
# --disable-html |
|
# --disable-docview |
|
# --disable-mdi |
|
# --disable-mdidoc |
|
# --disable-protocols |
|
# --disable-ftp |
|
# --disable-http |
|
# --disable-sound |
|
WXCONFIGURE_TUNNING_OPTION="--disable-htmlhelp --disable-html --disable-docview --disable-mdi --disable-mdidoc --disable-protocols --disable-ftp --disable-http --disable-sound" |
|
WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --with-xrc --enable-shared=no $WXCONFIGURE_TUNNING_OPTION" |
|
fi |
fi |
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
# MACOSX |
# MACOSX |
Line 484 if test "$with_wx" = "yes" ; then
|
Line 486 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 |
../$WX_SRCDIR/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" $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 |
Line 537 dnl SPECIFIC STUFF : CONFIGURATION OP
|
Line 540 dnl SPECIFIC STUFF : CONFIGURATION OP
|
dnl |
dnl |
dnl *************************************************************** |
dnl *************************************************************** |
|
|
# We don't use our graphic libraries for the pure GTK version (without GL) |
# Do not care with libpng or libjpeg with wx version because we use the wxwidgets one. |
|
if test "$with_wx" = "no" ; then |
# if configure has option --with-graphiclibs then dont check for system graphic libs |
# We don't use our graphic libraries for the pure GTK version (without GL) |
# force amaya static graphic libs to be used |
|
AC_ARG_WITH(graphiclibs, [ --with-graphiclibs use static libjpeg, libpng.]) |
# if configure has option --with-graphiclibs then dont check for system graphic libs |
if test "$with_graphiclibs" = "yes" -o "$enable_graphiclibs" = "yes" ; then |
# force amaya static graphic libs to be used |
no_graphic="no" |
AC_ARG_WITH(graphiclibs, [ --with-graphiclibs use static libjpeg, libpng.]) |
else |
if test "$with_graphiclibs" = "yes" -o "$enable_graphiclibs" = "yes" ; then |
no_graphic="yes" |
no_graphic="no" |
fi |
else |
|
no_graphic="yes" |
|
fi |
|
|
if test "$no_graphic" = yes; then |
if test "$no_graphic" = yes; then |
dnl |
dnl |
AC_MSG_CHECKING([for libjpeg version = 6b]) |
AC_MSG_CHECKING([for libjpeg version = 6b]) |
AC_EGREP_CPP([x 62 *x], |
AC_EGREP_CPP([x 62 *x], |
[#include <jpeglib.h> |
[#include <jpeglib.h> |
x JPEG_LIB_VERSION x], |
x JPEG_LIB_VERSION x], |
dnl |
dnl |
AC_MSG_RESULT([yes]) |
AC_MSG_RESULT([yes]) |
JPEGINCL='' |
JPEGINCL='' |
LIBJPEG='-ljpeg' |
LIBJPEG='-ljpeg' |
MAKEJPEG=['#'], |
MAKEJPEG=['#'], |
dnl |
dnl |
AC_MSG_RESULT([no]) |
AC_MSG_RESULT([no]) |
JPEGINCL='-I$(THOTDIR)/libjpeg' |
JPEGINCL='-I$(THOTDIR)/libjpeg' |
LIBJPEG='../libjpeg.a' dnl LIBJPEG goes into amaya/Makefile.in |
LIBJPEG='../libjpeg.a' dnl LIBJPEG goes into amaya/Makefile.in |
) |
) |
dnl |
dnl |
dnl |
dnl |
AC_MSG_CHECKING([for libpng version = 1.0.x or 1.2.x]) |
AC_MSG_CHECKING([for libpng version = 1.0.x or 1.2.x]) |
AC_EGREP_CPP([x \"1.[02]\..*\" *x], |
AC_EGREP_CPP([x \"1.[02]\..*\" *x], |
[#include <png.h> |
[#include <png.h> |
x PNG_LIBPNG_VER_STRING x], |
x PNG_LIBPNG_VER_STRING x], |
dnl |
dnl |
AC_MSG_RESULT([yes]) |
AC_MSG_RESULT([yes]) |
PNGINCL='' |
PNGINCL='' |
LIBPNG='-lpng' |
LIBPNG='-lpng' |
LIBZ='' |
LIBZ='' |
MAKEPNG=['#'], |
MAKEPNG=['#'], |
dnl |
dnl |
AC_MSG_RESULT([no]) |
AC_MSG_RESULT([no]) |
PNGINCL='-I$(THOTDIR)/libpng -I$(THOTDIR)/libpng/zlib' |
PNGINCL='-I$(THOTDIR)/libpng -I$(THOTDIR)/libpng/zlib' |
LIBPNG='../libpng.a' |
LIBPNG='../libpng.a' |
LIBZ='../libz.a' |
LIBZ='../libz.a' |
) |
) |
else |
else |
JPEGINCL='-I$(THOTDIR)/libjpeg' |
JPEGINCL='-I$(THOTDIR)/libjpeg' |
LIBJPEG='../libjpeg.a' |
LIBJPEG='../libjpeg.a' |
PNGINCL='-I$(THOTDIR)/libpng -I$(THOTDIR)/libpng/zlib' |
PNGINCL='-I$(THOTDIR)/libpng -I$(THOTDIR)/libpng/zlib' |
LIBPNG='../libpng.a' |
LIBPNG='../libpng.a' |
LIBZ='../libz.a' |
LIBZ='../libz.a' |
fi |
fi |
dnl |
dnl |
AC_SUBST(LIBJPEG) |
AC_SUBST(LIBJPEG) |
AC_SUBST(LIBPNG) |
AC_SUBST(LIBPNG) |
AC_SUBST(LIBZ) |
AC_SUBST(LIBZ) |
AC_SUBST(MAKEJPEG) |
AC_SUBST(MAKEJPEG) |
AC_SUBST(MAKEPNG) |
AC_SUBST(MAKEPNG) |
|
fi # with_wx = no |
|
|
AMAYA_VER="8.2" |
AMAYA_VER="8.2" |
|
|
Line 1182 AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS
|
Line 1188 AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS
|
#PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX" |
#PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX" |
AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS" |
AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS" |
|
|
IMGLIBS="-ljpeg -lpng -lz" |
if test "$with_wx" = "yes" ; then |
|
IMGLIBS="" |
|
else |
|
IMGLIBS="-ljpeg -lpng -lz" |
|
fi |
|
|
EXTRA_LIBS= |
EXTRA_LIBS= |
EXTRA_INCLUDES= |
EXTRA_INCLUDES= |
Line 1408 if test "$build_amaya" = "yes" ; then
|
Line 1418 if test "$build_amaya" = "yes" ; then
|
fi |
fi |
fi |
fi |
|
|
if test "$no_graphic" = "yes" ; then |
if test "$with_wx" = "no" ; then |
echo "Amaya configured with system graphic libraries (libjpeg, libpng, zlib)" |
if test "$no_graphic" = "yes" ; then |
else |
echo "Amaya configured with system graphic libraries (libjpeg, libpng, zlib)" |
echo "Amaya configured with static graphic libraries (libjpeg, libpng, zlib)" |
else |
if test "$with_gtk" = "yes" -o "$with_gl" = "yes" ; then |
echo "Amaya configured with static graphic libraries (libjpeg, libpng, zlib)" |
echo " N.B. This option may not work in your platform. If Amaya crashes" |
if test "$with_gtk" = "yes" -o "$with_gl" = "yes" ; then |
echo " when opening a PNG file. Recompile it using the system libraries." |
echo " N.B. This option may not work in your platform. If Amaya crashes" |
fi |
echo " when opening a PNG file. Recompile it using the system libraries." |
|
fi |
|
fi |
fi |
fi |
|
|
if test "$with_gtk" = "yes" ; then |
if test "$with_gtk" = "yes" ; then |