version 1.57, 2000/12/04 09:55:18
|
version 1.58, 2001/01/15 07:25:39
|
Line 52 AC_PATH_PROG(SED, sed, /bin/sed, $PATH:/
|
Line 52 AC_PATH_PROG(SED, sed, /bin/sed, $PATH:/
|
AC_PATH_PROG(AR, ar, /usr/bin/ar, $PATH:/bin:/usr/bin:/usr/ucb/bin) |
AC_PATH_PROG(AR, ar, /usr/bin/ar, $PATH:/bin:/usr/bin:/usr/ucb/bin) |
AC_PATH_PROG(DIFF, diff, /usr/bin/diff, $PATH:/bin:/usr/bin:/usr/ucb/bin) |
AC_PATH_PROG(DIFF, diff, /usr/bin/diff, $PATH:/bin:/usr/bin:/usr/ucb/bin) |
|
|
AC_ARG_WITH(more-shared, [ --with-included-jpeg use provided libjpeg, libpng.]) |
AC_ARG_WITH(more-shared, [ --without-included-jpeg doesn't use provided libjpeg, libpng.]) |
if test "$with_included_jpeg" != "yes" ; then |
if test "$with_included_jpeg" = "no" ; 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 |
Line 70 dnl
|
Line 70 dnl
|
dnl |
dnl |
dnl |
dnl |
AC_MSG_CHECKING([for libpng version = 1.0.x]) |
AC_MSG_CHECKING([for libpng version = 1.0.x]) |
AC_EGREP_CPP([x \"1.0\..*\" x], |
AC_EGREP_CPP([x \"1.0\..*\" *x], |
[#include <png.h> |
[#include <png.h> |
x PNG_LIBPNG_VER_STRING x], |
x PNG_LIBPNG_VER_STRING x], |
dnl |
dnl |
Line 229 AC_FUNC_MEMCMP
|
Line 229 AC_FUNC_MEMCMP
|
AC_FUNC_MMAP |
AC_FUNC_MMAP |
AC_TYPE_SIGNAL |
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) |
AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy) |
|
|
dnl |
dnl |
dnl Checking for Motif libraries and includes |
dnl Checking for Motif libraries and includes |
Line 410 dnl SPECIFIC STUFF : CONFIGURATION OP
|
Line 410 dnl SPECIFIC STUFF : CONFIGURATION OP
|
dnl |
dnl |
dnl *************************************************************** |
dnl *************************************************************** |
|
|
THOT_VER="2.4" |
THOT_VER="2.6" |
AMAYA_VER="3.2" |
AMAYA_VER="4.3" |
|
|
dnl |
dnl |
dnl We use a special versoin of cextract patched for alignment |
dnl We use a special versoin of cextract patched for alignment |
Line 553 dnl
|
Line 553 dnl
|
|
|
THOT_OPTIONS= |
THOT_OPTIONS= |
AMAYA_OPTIONS=$MATH_OPTIONS $GRAPH_OPTIONS |
AMAYA_OPTIONS=$MATH_OPTIONS $GRAPH_OPTIONS |
PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX" |
#PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX" |
AMAYA_ANNOT_OPTIONS= |
AMAYA_ANNOT_OPTIONS= |
IMGLIBS="-ljpeg -lpng -lz" |
IMGLIBS="-ljpeg -lpng -lz" |
EXTRA_LIBS= |
EXTRA_LIBS= |
Line 568 INCL="\$(THOTDIR)/thotlib/internals/h"
|
Line 568 INCL="\$(THOTDIR)/thotlib/internals/h"
|
FUNC="\$(THOTDIR)/thotlib/internals/f" |
FUNC="\$(THOTDIR)/thotlib/internals/f" |
SCHEMAS="\$(THOTDIR)/schemas" |
SCHEMAS="\$(THOTDIR)/schemas" |
SCHEMASOPERA="\$(THOTDIR)/schemasOPERA" |
SCHEMASOPERA="\$(THOTDIR)/schemasOPERA" |
test "$LIBJPEG" = '../libjpeg.a' && JPEGINCL="-I\$(THOTDIR)/libjpeg" |
if test "${LIBPNG}" = "../libpng.a" ; then |
#test "$LIBPNG" = '../libpng.a' && PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib" |
|
#there is a modified header file we need |
#there is a modified header file we need |
PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib" |
PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib" |
|
fi |
|
if test "${LIBJPEG}" = "../libjpeg.a" ; then |
|
#there is a modified header file we need |
|
JPEGINCL="-I\$(THOTDIR)/libjpeg" |
|
fi |
|
|
dnl |
dnl |
dnl Set up the include variables. |
dnl Set up the include variables. |
dnl |
dnl |
|
|
THOTINCLUDES="-I$API -I$VAR -I$INCL -I$FUNC -I$SCHEMAS -I$SCHEMASOPERA $JPEGINCL $PNGINCL" |
THOTINCLUDES="-I${API} -I${VAR} -I${INC}L -I${FUNC} -I${SCHEMAS} ${JPEGINCL} ${PNGINCL}" |
APIINCLUDES=-I$API |
APIINCLUDES=-I${API} |
if test "$VPATHOPT" = "" ; then |
|
|
if test "${VPATHOPT}" = "" ; then |
VPATHOPT="VPATH" |
VPATHOPT="VPATH" |
fi |
fi |
|
|