--- Amaya/configure.in	2007/02/27 08:48:23	1.217
+++ Amaya/configure.in	2007/02/27 14:54:52	1.218
@@ -213,7 +213,7 @@ dnl gtkgl is for integration of opengl i
 dnl freetype2 is for text drawing (fonts ...)
 dnl wxGLCanvas is for integration of opengl in wxWidgets (WX)
 AC_ARG_WITH([gl],
-   AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]),
+   AC_HELP_STRING([--with-gl],[enable canvas with hardware OpenGL implementation]),
    [case "${withval}" in
 	  yes) with_gl="yes" ;;
 	  no)  with_gl="no" ;;
@@ -222,7 +222,7 @@ AC_ARG_WITH([gl],
 	[with_gl="no"])
 
 # check if gtk gui should be used
-AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])
+AC_ARG_WITH(gtk, [ ])
 if test "$with_gtk" = "yes" ; then
   if test "$withval" = "no" ; then
     with_gtk="no"
@@ -234,7 +234,7 @@ if test "$with_gtk" = "yes" ; then
 fi
 
 # check if wxWidgets gui should be used
-AC_ARG_WITH(wx, [  --with-wx               use wxWidgets GUI toolkit])
+AC_ARG_WITH(wx, [ ])
 if test "$with_wx" = "yes" ; then
   if test "$withval" = "no" ; then
     with_wx="no"
@@ -243,7 +243,7 @@ if test "$with_wx" = "yes" ; then
     with_gtk="no"
   fi
 fi
-AC_ARG_ENABLE(system-wx,       [  --enable-system-wx try the wxWidgets system library ])
+AC_ARG_ENABLE(system-wx,       [  --enable-system-wx      try the wxWidgets system library ])
 if test "$with_gtk" = "" -o "$with_wx=" = "" ; then
   # Nothing is enable so force the default GUI toolkit (WX)
   with_gtk="no"
@@ -251,7 +251,7 @@ if test "$with_gtk" = "" -o "$with_wx="
 fi
 
 # check for mesa library (OpenGL)
-AC_ARG_WITH(MESA,              [  --with-mesa         enable canvas with software OpenGL implementation (Mesa) ])
+AC_ARG_WITH(MESA,              [  --with-mesa             enable canvas with software OpenGL implementation (default) ])
 if test "$with_mesa" = "" ; then
   with_mesa="no"
 fi
@@ -665,7 +665,7 @@ CEXTRACT_VER="1.7"
 CEXTRACT_FLAGS="+O"
 
 # Check if debug is enable
-AC_ARG_WITH(debug,              [  --with-debug          compiles Amaya with debuging options (-g) ])
+AC_ARG_WITH(debug,              [  --with-debug            compiles Amaya with debuging options (-g) ])
 if test "$with_debug" = "yes" ; then
   with_debug="yes"
   CFLAGS="-g"
@@ -1005,7 +1005,7 @@ AC_ARG_ENABLE([svg],
 	esac],
 	[with_svg="yes"])
 
-##########################Annotations and Bookmarks Support####################
+##########################Annotations Support####################
 dnl
 dnl annotations are enabled by default
 dnl
@@ -1018,35 +1018,9 @@ AC_ARG_ENABLE([annot],
 	esac],
 	[with_annot="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" ;;
-	  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
+#annot need Redland
+if test "$with_annot" = "yes" ; then
 	with_redland="yes"
 else
 	with_redland="no"
@@ -1113,7 +1087,7 @@ fi
 
 #At this point, we know everything about Redland,
 #so either set the variables we will need later,
-#ot disable Annotations and Bookmarks
+#or disable Annotations
 if test "$with_redland" = "yes" ; then
 	AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND"
 	if test "$with_system_redland" != "yes" ; then
@@ -1133,18 +1107,11 @@ if test "$with_redland" = "yes" ; then
        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
+ANNOTLIB_COMPILE_BM=['#']
 
-###################End of Annotations and Bookmarks Support####################
+###################End of Annotations Support####################
 
 
 dnl
@@ -1193,7 +1160,7 @@ fi
 dnl
 dnl WebDAV support enabled by default
 dnl
-AC_ARG_WITH(dav,            [  --with-dav              enable WebDAV support (experimental) ])
+AC_ARG_WITH(dav,            [  --with-dav              enable WebDAV support (default) ])
 if test "$with_dav" = "" ; then
   with_dav="yes"
 fi
@@ -1509,9 +1476,6 @@ if test "$build_amaya" = "yes" ; then
 	  echo Amaya configured with the Redland RDF library \(system\)
 	fi
     fi
-    if test "$with_bookmarks" = "yes" ; then
-	echo Amaya configured with bookmarks support \(experimental\)
-    fi
     if test "$with_templates" = "yes" ; then
 	echo Amaya configured with templates support \(experimental\)
     fi