version 1.131, 2004/04/07 09:06:09
|
version 1.132, 2004/04/21 09:06:33
|
Line 209 AC_TYPE_SIGNAL
|
Line 209 AC_TYPE_SIGNAL
|
AC_FUNC_VPRINTF |
AC_FUNC_VPRINTF |
AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy) |
AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy) |
|
|
|
# |
|
# Check for operating system (UNIX / WINDOWS / MACOSX ) |
|
# ----------> |
|
# canonicalize the target OS : default UNIX |
|
OS_OPTIONS="-D_UNIX" |
|
case $target_os in |
|
aix*) OS_OPTIONS="-D_UNIX" ;; |
|
cygwin*) OS_OPTIONS="-D_UNIX" ;; |
|
darwin*) OS_OPTIONS="-D_UNIX -D_MACOS" ;; |
|
freebsd2*) OS_OPTIONS="-D_UNIX" ;; |
|
freebsd*) OS_OPTIONS="-D_UNIX" ;; |
|
hpux*) OS_OPTIONS="-D_UNIX" ;; |
|
irix*) OS_OPTIONS="-D_UNIX" ;; |
|
linuxaout*) OS_OPTIONS="-D_UNIX" ;; |
|
linux*) OS_OPTIONS="-D_UNIX" ;; |
|
mingw32*) OS_OPTIONS="-D_UNIX" ;; |
|
netbsd*) OS_OPTIONS="-D_UNIX" ;; |
|
openbsd*) OS_OPTIONS="-D_UNIX" ;; |
|
osf[12]*) OS_OPTIONS="-D_UNIX" ;; |
|
osf*) OS_OPTIONS="-D_UNIX" ;; |
|
solaris2*) OS_OPTIONS="-D_UNIX" ;; |
|
sunos4*) OS_OPTIONS="-D_UNIX" ;; |
|
ultrix*) OS_OPTIONS="-D_UNIX" ;; |
|
esac |
|
|
AC_ARG_WITH(GL, [ --with-gl enable Opengl canvas (experimental) ]) |
AC_ARG_WITH(GL, [ --with-gl enable Opengl canvas (experimental) ]) |
dnl |
dnl |
dnl GL canvas is disabled by default |
dnl GL canvas is disabled by default |
Line 353 if test "$with_wx" = "yes" ; then
|
Line 378 if test "$with_wx" = "yes" ; then
|
|
|
WX_LIBRARIES="`wx-config --libs`" |
WX_LIBRARIES="`wx-config --libs`" |
|
|
dnl GL is used ? |
# GL is used ? |
if test "${with_gl}" = "yes" ; then |
if test "${with_gl}" = "yes" ; then |
WX_LIBRARIES="${WX_LIBRARIES} `wx-config --gl-libs`" |
WX_LIBRARIES="${WX_LIBRARIES} `wx-config --gl-libs`" |
|
|
|
# SG: this is a mistery why wx-config doesn't add these needed option on macosx |
|
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
|
WX_LIBRARIES="${WX_LIBRARIES} -framework OpenGL -framework AGL" |
|
fi |
fi |
fi |
|
|
dnl xrc ressources are used |
# xrc ressources are used |
WX_LIBRARIES="${WX_LIBRARIES} -l`wx-config --basename`_xrc-`wx-config --release`" |
WX_LIBRARIES="${WX_LIBRARIES} -l`wx-config --basename`_xrc-`wx-config --release`" |
|
|
AC_SUBST(WX_LIBRARIES) |
AC_SUBST(WX_LIBRARIES) |
WX_OPTIONS="-D_WX" |
WX_OPTIONS="-D_WX" |
|
|
|
no_motif=yes |
|
no_graphic=yes |
fi |
fi |
|
|
if test "$with_motif" = "yes" ; then |
if test "$with_motif" = "yes" ; then |
Line 549 dnl ***********************************
|
Line 582 dnl ***********************************
|
|
|
# We don't use our graphic libraries for the pure GTK version (without GL) |
# We don't use our graphic libraries for the pure GTK version (without GL) |
|
|
dnl echo "with gtk is ${with_gtk}, with gl is ${with_gl}\n" |
# if configure has option --with-graphiclibs then dont check for system graphic libs |
|
# force amaya static graphic libs to be used |
if test "${with_gtk}" != "yes" -o "${with_gl}" = "yes" ; then |
AC_ARG_WITH(graphiclibs, [ --with-graphiclibs use static libjpeg, libpng.]) |
AC_ARG_WITH(graphic-libs, [ --with-graphic-libs use static libjpeg, libpng.]) |
if test "$with_graphiclibs" = "yes" -o "enable_graphiclibs" = "yes" ; then |
if test "$withval" = "no" ; then |
no_graphic="no" |
no_graphic=yes |
else |
fi |
no_graphic="yes" |
if test "$withval" = "yes" ; then |
|
no_graphic=no |
|
fi |
|
fi |
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]) |
Line 645 CFLAGS="${CFLAGS} -x c"
|
Line 675 CFLAGS="${CFLAGS} -x c"
|
CXX_OPTIONS="-D__cplusplus" |
CXX_OPTIONS="-D__cplusplus" |
CXXFLAGS="${CXXFLAGS} -W -x c++ ${CXX_OPTIONS}" |
CXXFLAGS="${CXXFLAGS} -W -x c++ ${CXX_OPTIONS}" |
|
|
dnl |
# setup LDFLAGS |
dnl Check for operating system (UNIX / WINDOWS / MACOSX ) |
# on macosx, specific flags must be set to avoid conflicts with allready installed libwww |
dnl TODO : how to know the OS ... add some test to detect automaticaly |
# for exemple it's possible to install libwww with fink (fink install libwww) |
dnl |
# to avoid conflicts, we just force the linker to search for specified amaya path first |
OS_OPTIONS="-D_UNIX" |
if test "$OS_OPTIONS"="-D_UNIX -D_MACOS" ; then |
|
LDFLAGS="-Wl,-search_paths_first" |
|
else |
|
LDFLAGS="" |
|
fi |
|
|
dnl |
dnl |
dnl Check for availability of amaya sources |
dnl Check for availability of amaya sources |
Line 708 if test "$with_gl" = "yes" ; then
|
Line 742 if test "$with_gl" = "yes" ; then
|
AC_MSG_RESULT([yes]) |
AC_MSG_RESULT([yes]) |
break |
break |
fi |
fi |
done |
done |
AC_MSG_CHECKING([GTKGLAREA]) |
|
for ac_dir in \ |
# check for gtkglarea.h only if gtk gui is selected |
/usr/include/GL \ |
if test "$with_gtk" = "yes" ; then |
|
AC_MSG_CHECKING([GTKGLAREA]) |
|
for ac_dir in \ |
|
/usr/include/GL \ |
/usr/include \ |
/usr/include \ |
/usr/X11R6/include/GL \ |
/usr/X11R6/include/GL \ |
/usr/X11R6/include \ |
/usr/X11R6/include \ |
/usr/local/include \ |
/usr/local/include \ |
/usr/local/include/GL \ |
/usr/local/include/GL \ |
; \ |
; \ |
do if test -r "$ac_dir/gtkgl/gtkglarea.h" ; then |
do if test -r "$ac_dir/gtkgl/gtkglarea.h" ; then |
gtkgl_inc="yes" |
gtkgl_inc="yes" |
if test "$ac_dir" != "/usr/include" ; then |
if test "$ac_dir" != "/usr/include" ; then |
if test "$ac_dir" != "$GL_INC_II" ; then |
if test "$ac_dir" != "$GL_INC_II" ; then |
if test "$ac_dir" != "$GL_INC_I" ; then |
if test "$ac_dir" != "$GL_INC_I" ; then |
GL_INCLUDES="$GL_INCLUDES -I$ac_dir" |
GL_INCLUDES="$GL_INCLUDES -I$ac_dir" |
fi |
fi |
fi |
fi |
fi |
fi |
AC_MSG_RESULT([yes]) |
AC_MSG_RESULT([yes]) |
break |
break |
fi |
fi |
done |
done |
|
GTKGL_LIBS="-lgtkgl" |
|
else |
|
gtkgl_inc="ignore" |
|
GTKGL_LIBS="" |
|
fi |
|
|
AC_MSG_CHECKING([freetype]) |
AC_MSG_CHECKING([freetype]) |
for ac_dir in \ |
for ac_dir in \ |
/usr/include \ |
/usr/include \ |
/usr/X11R6/include \ |
/usr/X11R6/include \ |
/usr/local/include \ |
/usr/local/include \ |
|
/opt/local/include \ |
|
/usr/X11R6/include/freetype2 \ |
; \ |
; \ |
do if test -r "$ac_dir/ft2build.h" ; then |
do if test -r "$ac_dir/ft2build.h" ; then |
freetype_inc="yes" |
freetype_inc="yes" |
Line 798 if test "$with_gl" = "yes" ; then
|
Line 843 if test "$with_gl" = "yes" ; then
|
GL_LIBRARIES= |
GL_LIBRARIES= |
exit 1; |
exit 1; |
fi |
fi |
|
|
if test "$gtkgl_inc" = "" ; then |
if test "$gtkgl_inc" = "" ; then |
AC_MSG_WARN(Gtkglarea headers (gktglarea.h) not found !!) |
AC_MSG_WARN(Gtkglarea headers (gktglarea.h) not found !!) |
AC_MSG_WARN(Disabling opengl build !) |
AC_MSG_WARN(Disabling opengl build !) |
Line 807 if test "$with_gl" = "yes" ; then
|
Line 853 if test "$with_gl" = "yes" ; then
|
GL_LIBRARIES= |
GL_LIBRARIES= |
exit 1; |
exit 1; |
fi |
fi |
|
|
if test "$freetype_inc" = "" ; then |
if test "$freetype_inc" = "" ; then |
AC_MSG_WARN(Freetype 2 headers (ft2build.h) not found !!) |
AC_MSG_WARN(Freetype 2 headers (ft2build.h) not found !!) |
AC_MSG_WARN(Disabling opengl build !) |
AC_MSG_WARN(Disabling opengl build !) |
Line 827 if test "$with_gl" = "yes" ; then
|
Line 874 if test "$with_gl" = "yes" ; then
|
fi |
fi |
if test "$gl_inc" = "yes" ; then |
if test "$gl_inc" = "yes" ; then |
if test "$glu_inc" = "yes" ; then |
if test "$glu_inc" = "yes" ; then |
if test "$gtkgl_inc" = "yes" ; then |
if test "$gtkgl_inc" = "yes" -o "$gtkgl_inc" = "ignore" ; then |
if test "$freetype_inc" = "yes" ; then |
if test "$freetype_inc" = "yes" ; then |
if test "$xft_inc" = "yes" ; then |
if test "$xft_inc" = "yes" ; then |
if test "$stdglu_inc" = "yes" ; then |
if test "$stdglu_inc" = "yes" ; then |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXmu -lXft -lfreetype -lGL -lGLU -lgtkgl -lstdc++" |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXmu -lXft -lfreetype -lGL -lGLU ${GTKGL_LIBS} -lstdc++" |
else |
else |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXmu -lXft -lfreetype -lGL -lGLU -lgtkgl" |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXmu -lXft -lfreetype -lGL -lGLU ${GTKGL_LIBS}" |
fi |
fi |
GL_OPTIONS="-D_GL" |
GL_OPTIONS="-D_GL" |
no_motif=yes |
no_motif=yes |
Line 1181 AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS
|
Line 1228 AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS
|
AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS" |
AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS" |
|
|
IMGLIBS="-ljpeg -lpng -lz" |
IMGLIBS="-ljpeg -lpng -lz" |
|
|
EXTRA_LIBS= |
EXTRA_LIBS= |
EXTRA_INCLUDES= |
EXTRA_INCLUDES= |
|
|