Re: [amaya-dev]Re: More questions abour the build system
Régis Boudin <[email protected]>
| Newsgroups | gmane.comp.web.amaya.devel |
|---|---|
| Message-ID | <[email protected]> |
On Mon, 2006-10-30 at 18:24 +0200, Irene Vatton wrote: > On Friday 27 October 2006 17:06, [email protected] wrote: > > > Normally we have to use static raptor & redland. > > > > Is there a specific reason to that ? > > Unfortunately yes, when the API changes from one version to another. Wouldn't it make more sens to change the Amaya source code to follow the new API in this case ? IT would make you benefit from improvements and bug fixes from the library. Plus, it makes less code for you to maintain. I had a quick look, changes don't seem very intrusive. The attached dont_use_constructor.diff patch removes a useless call to librdf_serializer_rdfxml_constructor(), which is already called indirectly by librdf_world_open() including in the version you provide, so it can be safely applied. This only leaves 2 issues with the latest version of librdf. > > Honestly, my aim is slightly different. What I would like to see is a -src > > archive which can be built without using any static library on systems > > providing the shared ones. I already do this with the Debian package, > > though my patch doesn't cover all the cases (and is therefore not ready > > for inclusion). > > On our side, we'll continue to generate Amaya versions with some static > libraries. That concerns libraries that need patches or whose API changes > between two versions. I clearly understand that, that's why the patches I submit work this way by default. I only try to make it possible (and if possible easy) to use shared libraries. Anyway, 2 more patches : cleanup.diff : -gets rid of test against unexisting variable enable_gl and replaces the AC_ARG_WITH(GL) by a cleaner thing. -replaces NOPRINT and PRINTIFNOTGL by their values -removes duplicate use OF AC_ARG_ENABLE() -gets rid of with_raptor, which is never set -gets rid of the test against with_nogui, which can never be true -remove all the mechanism to build libraptor. It is useless, as redland includes it already and it relied on the existence of the libraptor directory, which was never created. -removes the RAPTOR_RDF_PARSER flag, which is set but never checked. auto_redland.diff : -removes the --disable-redland option, and replaces it by a mechanism to automatically enable or disable the build/link of redland, depending on the enabling/disabling of annotations and bookmarks, reverts back to le builtin version if the shared one was requested but not available. I'm also working on other patches, but I will submit them when I feel they are of good enough quality. Regards, Regis
dont_use_constructor.diff
(text/x-patch, 517 B)
Index: Amaya/annotlib/BMfile.c
===================================================================
--- Amaya.orig/annotlib/BMfile.c 2006-10-30 21:33:06.373779500 +0000
+++ Amaya/annotlib/BMfile.c 2006-10-30 21:33:31.439346000 +0000
@@ -365,9 +365,6 @@
/* Open an environment */
librdf_world_open (world);
-
- /* register the rdfxml serializer */
- librdf_serializer_rdfxml_constructor (world);
}
/* create a new librdf_storage object, the place where statements will be stored? */
cleanup.diff
(text/x-patch, 7.6 KB)
Index: Amaya/configure.in
===================================================================
--- Amaya.orig/configure.in 2006-10-30 21:09:31.093330000 +0000
+++ Amaya/configure.in 2006-11-03 22:11:06.234106750 +0000
@@ -200,7 +200,6 @@
MACOSX) OS_OPTIONS="-D_UNIX -D_MACOS" ;;
esac
-AC_ARG_WITH(GL, [ --with-gl enable Opengl canvas (experimental) ])
dnl
dnl GL canvas is disabled by default in 8.7.x
dnl GL canvas is enabled by default in 9.x
@@ -213,13 +212,15 @@
dnl gtkgl is for integration of opengl in GTK
dnl freetype2 is for text drawing (fonts ...)
dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)
-if test "$with_gl" = "" ; then
- if test "$enable_gl" = "yes" ; then
- with_gl="yes"
- else
- with_gl="no"
- fi
-fi
+AC_ARG_WITH([gl],
+ AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]),
+ [case "${withval}" in
+ yes) with_gl="yes" ;;
+ no) with_gl="no" ;;
+ *) AC_MSG_ERROR(bad value ${withval} for --with-gl) ;;
+ esac],
+ [with_gl="no"])
+
# check if gtk gui should be used
AC_ARG_WITH(gtk, [ --with-gtk use GTK GUI toolkit ])
@@ -995,32 +996,8 @@
fi
done
-# not used in makefiles
-# AC_SUBST(STDCPP_INCLUDES)
-# AC_SUBST(STDCPP_LIBRARIES)
-
- NOPRINT=""
- PRINTIFNOTGL=" print_prog"
-
-else # if with_gl or with_mesa
-
- NOPRINT=""
- PRINTIFNOTGL=" print_prog"
-
fi # if with_gl or with_mesa
-AC_SUBST(PRINTIFNOTGL)
-AC_SUBST(NOPRINT)
-
-
-AC_ARG_ENABLE(svg, [ --disable-svg remove SVG support ])
-AC_ARG_ENABLE(annot, [ --disable-annot remove Annotations support ])
-AC_ARG_ENABLE(redland, [ --disable-redland disable the redland RDF library ])
-AC_ARG_ENABLE(system-redland, [ --enable-system-redland try the redland RDF system library ])
-AC_ARG_ENABLE(bookmarks, [ --enable-bookmarks enables experimental bookmark support ])
-AC_ARG_ENABLE(templates, [ --disable-templates disables experimental templates support ])
-AC_ARG_ENABLE(generic-xml, [ --disable-generic-xml remove Generic XML support ])
-
AC_ARG_ENABLE([svg],
AC_HELP_STRING([--disable-svg],[disable SVG support]),
[case "${enableval}" in
@@ -1176,8 +1153,6 @@
if test "$with_redland" = "yes" -a "$with_annot" = "no" -a "$with_bookmarks" = "no"; then
AC_MSG_WARN(Disabling redland as neither annotations nor bookmarks are enabled !)
- MAKERAPTOR=['#']
- with_raptor="no"
fi
redland_compile_source=yes
@@ -1222,11 +1197,11 @@
fi
if test "$with_redland" = "yes" ; then
- AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND -DRAPTOR_RDF_PARSER"
+ AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"
if test "$redland_compile_source" = "yes" ; then
AMAYA_RAPTOR_SRC="amaya_comp_redland"
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
- AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a"
+ AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a"
AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
else
MAKEREDLAND=['#']
@@ -1383,7 +1358,6 @@
AC_SUBST(WITHDAV)
AC_SUBST(WWWDAV)
-AC_SUBST(MAKERAPTOR)
AC_SUBST(MAKEREDLAND)
AC_SUBST(ANNOTLIB_COMPILE_BM)
AC_SUBST(AMAYA_RAPTOR_SRC)
@@ -1529,9 +1503,6 @@
if test "$with_annot" = "yes" ; then
echo Amaya configured with Annotations support
fi
- if test "$with_raptor" = "yes" ; then
- echo Amaya configured with the Raptor RDF parser
- fi
if test "$with_redland" = "yes" ; then
if test "$with_system_redland" = "no" ; then
echo Amaya configured with the Redland RDF library \(local source\)
@@ -1584,10 +1555,6 @@
fi
fi
-if test "$with_nogui" = "yes" ; then
- echo "Amaya configured without GUI toolkit"
-fi
-
echo ""
echo "Now type \"make\" (GNU make preferably) to build the binaries"
Index: Amaya/Makefile.in
===================================================================
--- Amaya.orig/Makefile.in 2006-10-30 21:09:31.105330750 +0000
+++ Amaya/Makefile.in 2006-11-03 21:47:42.906404250 +0000
@@ -12,14 +12,13 @@
include Options
LIBWWW = libwww
-LIBRAPTOR = libraptor
REDLAND = redland
LIBJPEG = libjpeg
LIBPNG = libpng
#MKP: adding davlib
SUBDIRS = @SUBDIRS@ tools thotlib batch drawlib indexlib annotlib amaya thot @DAVDIR@
-EXTRA_SUBDIRS= misc pluginlib $(LIBRAPTOR) $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)
+EXTRA_SUBDIRS= misc pluginlib $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -28,11 +27,11 @@
srcdir = $(THOTDIR)
-default : tools gl @BUILDWXWIDGETS@ thotlib batch amaya_prog @PRINTIFNOTGL@
+default : tools gl @BUILDWXWIDGETS@ thotlib batch amaya_prog print_prog
-amaya : amaya_prog tools thotlib @PRINTIFNOTGL@
+amaya : amaya_prog tools thotlib print_prog
-@NOPRINT@print : tools thotlib print_prog
+print : tools thotlib print_prog
Options:
@CP@ Options.orig Options
@@ -63,9 +62,9 @@
@(if test -d "$(GL_BUILDDIR)" ; then cd "$(GL_BUILDDIR)" ; \
$(MAKE) linux-static ; fi)
-@NOPRINT@print_prog: rebuild force bin/str
-@NOPRINT@ @(if test -d thotlib ; then cd thotlib ; \
-@NOPRINT@ $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)
+print_prog: rebuild force bin/str
+ @(if test -d thotlib ; then cd thotlib ; \
+ $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)
misc: rebuild force
@(if test -d misc ; then cd misc ; \
@@ -294,51 +293,6 @@
@($(ECHO) "libwww is installed")
#
-# Rules to build the raptor RDF package
-#
-
-libraptor_config: @MAKERAPTOR@ force
- @(if [ ! -e "$(THOTDIR)/$(LIBRAPTOR)" ] ; then \
- $(ECHO) "Error raptor dir not found at $(THOTDIR)/$(LIBRAPTOR)" ; \
- fi)
- @(if [ ! -e "$(THOTDIR)/$(LIBRAPTOR)/expat" ] ; then \
- libwwwdir="$(THOTDIR)/../$(LIBWWW)" ; \
- echo $$libwwwdir ; \
- $(LN_S) "$$libwwwdir/modules/expat" "$(THOTDIR)/$(LIBRAPTOR)/expat" ; \
- fi)
- @(if [ ! -d "$(LIBRAPTOR)" ] ; then \
- $(MKDIR) $(LIBRAPTOR) ; \
- fi)
- @(localdir=`pwd` ; raptordir="$$localdir/../$(LIBRAPTOR)" ; \
- cd $(LIBRAPTOR) ; unset LANG; \
- if [ ! -f Makefile -o ! -f config.h ] ; then \
- CFLAGS="-I$$raptordir/expat/lib" \
- $$raptordir/configure \
- --build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \
- --without-shared \
- --with-expat ; \
- $(ECHO) "patching libraptor/libtool because -flat_namespace option is missing and do not compile on macosx" ; \
- $(CP) libtool libtool.orig ; \
- $(SED) "s/\(allow_undefined_flag=\"-undefined suppress\)/\1 -flat_namespace/" \
- libtool.orig > libtool ; \
- $(ECHO) "libraptor/libtool patched !" ; \
- $(ECHO) "libraptor is configured" ; \
- fi)
-
-libraptor_make: @MAKERAPTOR@ force
- @(localdir=`pwd`; \
- cd $(LIBRAPTOR) ; \
- if [ ! -e .libs/libraptor.a -a -e libraptor.la ] ; then \
- $(RM) libraptor.la ; \
- fi ; \
- $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -I$$localdir/../$(LIBRAPTOR)/expat/lib " \
- CPPFLAGS="$(CPPFLAGS)" \
- )
-
-libraptor: @MAKERAPTOR@ libraptor_config libraptor_make
- @($(ECHO) "libraptor is installed")
-
-#
# Rules to build the redland RDF library
#
Index: Amaya/Options.in
===================================================================
--- Amaya.orig/Options.in 2006-10-30 21:09:31.113331250 +0000
+++ Amaya/Options.in 2006-10-30 21:09:48.546420750 +0000
@@ -81,8 +81,6 @@
GL_LIBRARIES=@GL_LIBRARIES@
-PRINTIFNOTGL=@PRINTIFNOTGL@
-
LIBWWW=libwww
auto_redland.diff
(text/x-patch, 9.6 KB)
Index: Amaya/configure.in
===================================================================
--- Amaya.orig/configure.in 2006-11-03 22:11:06.234106750 +0000
+++ Amaya/configure.in 2006-11-03 22:11:30.075596750 +0000
@@ -1007,6 +1007,7 @@
esac],
[with_svg="yes"])
+##########################Annotations and Bookmarks Support####################
dnl
dnl annotations are enabled by default
dnl
@@ -1020,29 +1021,132 @@
[with_annot="yes"])
dnl
-dnl The redland library is enabled by default
-dnl
-AC_ARG_ENABLE([redland],
- AC_HELP_STRING([--disable-redland],[disable redland RDF support]),
- [case "${enableval}" in
- yes) with_redland="yes" ;;
- no) with_redland="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-redland) ;;
- esac],
- [with_redland="yes"])
-
-dnl
dnl The bookmarks support is disabled by default
dnl
AC_ARG_ENABLE([bookmarks],
AC_HELP_STRING([--enable-bookmarks],[enable experimental bookmark support]),
[case "${enableval}" in
- yes) with_bookmarks="yes"; with_redland="yes" ;;
+ yes) with_bookmarks="yes";;
no) with_bookmarks="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-bookmarks) ;;
esac],
[with_bookmarks="no"])
+#if the directory containing Annotlib
+#and Bookmarks is not present,
+#don't try to build them
+if test ! -f $srcdir/annotlib/Makefile.in ; then
+ AC_MSG_WARN(Annotation makefile not found !!)
+ AC_MSG_WARN(Disabling Annotations build !)
+ with_annot="no"
+ with_bookmarks="no"
+fi
+
+if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then
+ AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)
+ with_bookmarks="no"
+fi
+
+#annot and bookmarks need Redland
+if test "$with_annot" = "yes" -o "$with_bookmarks" = "yes" ; then
+ with_redland="yes"
+else
+ with_redland="no"
+fi
+
+AC_ARG_ENABLE([system-redland],
+ AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),
+ [case "${enableval}" in
+ yes) with_system_redland="yes";;
+ no) with_system_redland="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;
+ esac],
+ [with_system_redland="no"])
+
+#If Redland is needed and we are asked
+#to use the system library, check if is present
+if test "$with_redland" = "yes" -a "$with_system_redland" = "yes" ; then
+ # check to see if we have a redland library
+ AC_PATH_PROG([REDLAND_CONFIG],[redland-config])
+
+ if test "$REDLAND_CONFIG" = "" ; then
+ AC_MSG_WARN(Not using system-provided redland library)
+ with_system_redland="no"
+ else
+
+ AC_MSG_CHECKING(system redland version)
+ redland_min_version=0.9.16
+ REDLAND_VERSION=`$REDLAND_CONFIG --version`
+ redland_version_dec=`echo $REDLAND_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+ redland_min_version_dec=`echo $redland_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+ if test $redland_version_dec -lt $redland_min_version_dec; then
+ AC_MSG_RESULT(no - found version $REDLAND_VERSION and minimal version is $redland_min_version)
+ with_system_redland="no"
+ else
+ AC_MSG_RESULT(yes - found version $REDLAND_VERSION)
+ AC_MSG_CHECKING(checking for redland headers)
+ dnl We should use awk here and remove the -I from the following line
+ dnl REDLAND_HEADERS=`$REDLAND_CONFIG --cflags`
+ REDLAND_HEADERS=""
+ if test -e "/usr/include/redland.h" ; then
+ REDLAND_HEADERS="/usr/include";
+ elif test -e "/usr/local/include/redland.h" ; then
+ REDLAND_HEADERS="/usr/local/include";
+ fi
+ if test $REDLAND_HEADERS != ""; then
+ AC_MSG_RESULT(yes - have development version)
+ else
+ AC_MSG_RESULT(no - no development version)
+ with_system_redland="no"
+ fi
+ fi
+ fi
+fi
+
+#if we use the builtin library,
+#check it is present
+if test "$with_redland" = "yes" -a "$with_system_redland" != "yes" \
+ -a ! -d "$srcdir/../redland" ; then
+ AC_MSG_WARN(Redland source dir not found !!)
+ AC_MSG_WARN(Disabling redland build !)
+ MAKEREDLAND=['#']
+ with_redland="no"
+fi
+
+#At this point, we know everything about Redland,
+#so either set the variables we will need later,
+#ot disable Annotations and Bookmarks
+if test "$with_redland" = "yes" ; then
+ AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"
+ if test "$with_system_redland" != "yes" ; then
+ AMAYA_RAPTOR_SRC="amaya_comp_redland"
+ AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
+ AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a"
+ AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
+ else
+ MAKEREDLAND=['#']
+ AMAYA_RAPTOR_SRC=
+ redland_includes=`$REDLAND_CONFIG --cflags`
+ AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS"
+ AMAYA_ANNOT_INCLUDES="$redland_includes -I\$(THOTDIR)/thotlib/include"
+ AMAYA_ANNOT_EXTRA_LIBS=`$REDLAND_CONFIG --libs`
+ AMAYA_RAPTOR_INCLUDES="$redland_includes"
+ fi
+else
+ with_annot="no"
+ with_bookmarks="no"
+fi
+
+#Bookmarks require some specific flags
+if test "$with_bookmarks" = "yes" ; then
+ ANNOTLIB_COMPILE_BM=
+ AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"
+else
+ ANNOTLIB_COMPILE_BM=['#']
+fi
+
+###################End of Annotations and Bookmarks Support####################
+
dnl
dnl The templates support is enabled by default
dnl
@@ -1086,15 +1190,6 @@
GENERIC_XML_OPTIONS=""
fi
-AC_ARG_ENABLE([system-redland],
- AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),
- [case "${enableval}" in
- yes) with_system_redland="yes"; with_redland="yes" ;;
- no) with_system_redland="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;
- esac],
- [with_system_redland="no"])
-
dnl
dnl WebDAV support enabled by default
dnl
@@ -1143,99 +1238,6 @@
fi
fi
- if test ! -f $srcdir/annotlib/Makefile.in ; then
- if test "$with_annot" = "yes" ; then
- AC_MSG_WARN(Annotation makefile not found !!)
- AC_MSG_WARN(Disabling Annotations build !)
- with_annot="no"
- fi
- fi
-
- if test "$with_redland" = "yes" -a "$with_annot" = "no" -a "$with_bookmarks" = "no"; then
- AC_MSG_WARN(Disabling redland as neither annotations nor bookmarks are enabled !)
- fi
-
- redland_compile_source=yes
- if test "$with_redland" = "yes" -a "$with_system_redland" = "yes" ; then
- # check to see if we have a redland library
- AC_MSG_CHECKING(system redland library)
- redland_min_version=0.9.16
- REDLAND_CONFIG="redland-config"
- REDLAND_VERSION=`$REDLAND_CONFIG --version`
- redland_version_dec=`echo $REDLAND_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
- redland_min_version_dec=`echo $redland_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
- if test $redland_version_dec -lt $redland_min_version_dec; then
- AC_MSG_RESULT(no - found version $REDLAND_VERSION and minimal version is $redland_min_version)
- else
- AC_MSG_RESULT(yes - found version $REDLAND_VERSION)
- AC_MSG_CHECKING(checking for redland headers)
- dnl We should use awk here and remove the -I from the following line
- dnl REDLAND_HEADERS=`$REDLAND_CONFIG --cflags`
- REDLAND_HEADERS=""
- if test -e "/usr/include/redland.h" ; then
- REDLAND_HEADERS="/usr/include";
- else
- if test -e "/usr/local/include/redland.h" ; then
- REDLAND_HEADERS="/usr/local/include";
- fi
- fi
- if test $REDLAND_HEADERS != ""; then
- AC_MSG_RESULT(yes - have development version)
- redland_compile_source=no
- else
- AC_MSG_RESULT(no - no development version)
- fi
- fi
- fi
-
- if test "$with_redland" = "yes" -a "$redland_compile_source" = "yes" \
- -a ! -d "$srcdir/../redland" ; then
- AC_MSG_WARN(Redland source dir not found !!)
- AC_MSG_WARN(Disabling redland build !)
- MAKEREDLAND=['#']
- with_redland="no"
- fi
-
- if test "$with_redland" = "yes" ; then
- AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"
- if test "$redland_compile_source" = "yes" ; then
- AMAYA_RAPTOR_SRC="amaya_comp_redland"
- AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
- AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a"
- AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
- else
- MAKEREDLAND=['#']
- AMAYA_RAPTOR_SRC=
- redland_includes=`$REDLAND_CONFIG --cflags`
- redland_libs=`$REDLAND_CONFIG --libs`
- AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS"
- AMAYA_ANNOT_INCLUDES="$redland_includes -I\$(THOTDIR)/thotlib/include"
- AMAYA_ANNOT_EXTRA_LIBS="$redland_libs"
- AMAYA_RAPTOR_INCLUDES="$redland_includes"
- fi
- fi
-
-
- dnl control whether we should build the bookmarks support
- if test "$with_annot" = "yes" -a "$with_redland" = "no" ; then
- AC_MSG_WARN(Disabling annotations build as redland is disabled !)
- with_annot="no"
- fi
- if test "$with_bookmarks" = "yes" -a "$with_annot" = "no" ; then
- AC_MSG_WARN(Disabling bookmarks build as annotations are disabled !)
- with_bookmarks="no"
- fi
- if test "$with_bookmarks" = "yes" -a "$with_redland" = "no" ; then
- AC_MSG_WARN(Disabling bookmarks build as redland is disabled !)
- with_bookmarks="no"
- fi
- if test "$with_bookmarks" = "yes" ; then
- ANNOTLIB_COMPILE_BM=
- AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DBOOKMARKS"
- else
- ANNOTLIB_COMPILE_BM=['#']
- fi
-
if test ! -f $srcdir/davlib/Makefile.in ; then
if test "$with_dav" = "yes" ; then
AC_MSG_WARN(WebDAV makefile not found !!)