version 1.87, 2002/04/25 10:25:44
|
version 1.88, 2002/05/31 10:48:41
|
Line 745 fi
|
Line 745 fi
|
dnl |
dnl |
dnl Annotation thread support enabled by default |
dnl Annotation thread support enabled by default |
dnl |
dnl |
dnl if test "$with_annot_threads" = "" ; then |
if test "$with_annot_threads" = "" ; then |
dnl if test "$enable_annot_threads" = "no" ; then |
if test "$enable_annot_threads" = "no" ; then |
dnl with_annot_threads="no" |
with_annot_threads="no" |
dnl ANNOT_THREAD_OPTIONS= |
ANNOT_THREAD_OPTIONS= |
dnl else |
else |
dnl with_annot_threads="yes" |
with_annot_threads="yes" |
dnl ANNOT_THREAD_OPTIONS=-DANNOT_ON_ANNOT |
ANNOT_THREAD_OPTIONS=-DANNOT_ON_ANNOT |
dnl fi |
fi |
dnl fi |
fi |
|
|
|
AC_ARG_WITH(dav, [ --with-dav enable WebDAV support (experimental) ]) |
|
dnl |
|
dnl DAV support disabled by default |
|
dnl |
|
if test "$with_dav" = "" ; then |
|
if test "$enable_dav" = "yes" ; then |
|
with_dav="yes" |
|
else |
|
with_dav="no" |
|
fi |
|
fi |
|
|
|
if test "$with_dav" = "yes" ; then |
|
DAV_OPTIONS=-DDAV |
|
else |
|
with_dav="no" |
|
DAV_OPTIONS="" |
|
fi |
|
|
|
|
if test "$build_amaya" = "yes" ; then |
if test "$build_amaya" = "yes" ; then |
if test ! -f $srcdir/../libwww/Makefile.in ; then |
if test ! -f $srcdir/../libwww/Makefile.in ; then |
Line 801 dnl fi
|
Line 821 dnl fi
|
with_plugin="no" |
with_plugin="no" |
fi |
fi |
|
|
|
|
|
if test ! -f $srcdir/davlib/Makefile.in ; then |
|
if test "$with_dav" = "yes" ; then |
|
AC_MSG_WARN(WebDAV makefile not found !!) |
|
AC_MSG_WARN(Disabling WebDAV build !) |
|
with_dav="no" |
|
fi |
|
fi |
|
|
|
|
fi |
fi |
|
|
dnl |
dnl |
Line 901 else
|
Line 931 else
|
annot_frag=/dev/null |
annot_frag=/dev/null |
fi |
fi |
|
|
|
if test "$with_dav" = "yes" ; then |
|
AC_SUBST_FILE(dav_frag) |
|
dav_frag=$srcdir/davlib/Makefile.dav |
|
fi |
|
|
dnl *************************************************************** |
dnl *************************************************************** |
dnl |
dnl |
Line 931 $srcdir/pluginlib/Makefile.plugin"
|
Line 965 $srcdir/pluginlib/Makefile.plugin"
|
make_output="$make_output annotlib/Makefile" |
make_output="$make_output annotlib/Makefile" |
EXTRA_MAKEFILE_IN="$srcdir/annotlib/Makefile.in" |
EXTRA_MAKEFILE_IN="$srcdir/annotlib/Makefile.in" |
fi |
fi |
|
|
|
if test "$with_dav" = "yes" ; then |
|
make_output="$make_output davlib/Makefile" |
|
EXTRA_MAKEFILE_IN="$srcdir/davlib/Makefile.in" |
|
fi |
|
|
fi |
fi |
|
|
AC_SUBST(EXTRA_MAKEFILE_IN) |
AC_SUBST(EXTRA_MAKEFILE_IN) |
Line 984 dnl fi
|
Line 1024 dnl fi
|
if test "$with_gl" = "yes" ; then |
if test "$with_gl" = "yes" ; then |
echo Amaya configured with Opengl Canvas Rendering \(experimental\) |
echo Amaya configured with Opengl Canvas Rendering \(experimental\) |
fi |
fi |
|
if test "$with_dav" = "yes" ; then |
|
echo Amaya configured with WebDAV support \(experimental\) |
|
fi |
fi |
fi |
|
|
if test "$no_motif" = yes ; then |
if test "$no_motif" = yes ; then |