Re: [PATCH] documentation, (n-i)th try

[Diego González <diego pemas net>]

On Tue, 2002-12-17 at 17:06, Alexander Larsson wrote:
> On 17 Dec 2002, Diego González wrote:
> 
> > On Tue, 2002-12-17 at 11:01, Alexander Larsson wrote:
> > > On 16 Dec 2002, Diego González wrote:
> > > 
> > > > i have fixed the stuff that you commented on, this patch also
> > > > reorganizes the documentation, i have also added a some descriptions
> > > > about async operations (a little introduction) and some other things
> > > > that i don't remmeber.
> > > 
> > > I still don't understand the configure.in changes. You spend a lot of 
> > > effort on whether gtk-doc 0.10 is availible or not, but all it is used for 
> > > is to print "yes" or "no". If ENABLE_GTK_DOC is yes, shouldn't gtk-doc 
> > > 0.10 be required?
> > 
> > maybe this patch will do it, please check it

> 
> without the
> +AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
>  
> you had before.

let's try it again

i feel i'm almost there ;-)
-- 
Diego González <diego pemas net>

Index: gnome-vfs/configure.in
===================================================================
RCS file: /cvs/gnome/gnome-vfs/configure.in,v
retrieving revision 1.201
diff -u -r1.201 configure.in
--- gnome-vfs/configure.in	1 Dec 2002 09:33:50 -0000	1.201
+++ gnome-vfs/configure.in	17 Dec 2002 16:32:59 -0000
@@ -435,13 +435,35 @@
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 
-
-AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
-AC_SUBST(HAVE_GTK_DOC)
+gtk_doc_min_version=0.10
+if $GTKDOC ; then
+    gtk_doc_version=`gtkdoc-mkdb --version`
+    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
+
+    IFS="${IFS=         }"; gtk_save_IFS="$IFS"; IFS="."
+    set $gtk_doc_version
+    for min in $gtk_doc_min_version ; do
+        cur=$1; shift
+        if test -z $min ; then break; fi
+        if test -z $cur ; then GTKDOC=false; break; fi
+        if test $cur -gt $min ; then break ; fi
+        if test $cur -lt $min ; then GTKDOC=false; break ; fi
+    done
+    IFS="$gtk_save_IFS"
+    
+    if $GTKDOC ; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+fi
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
+AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
+AC_SUBST(HAVE_GTK_DOC)
+
 dnl Let people disable the gtk-doc stuff.
 AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
 
@@ -453,16 +475,9 @@
   fi
 fi
 
-if test "x$enable_gtk_doc" = xyes; then
-	ENABLE_GTK_DOC=true
-else
- 	ENABLE_GTK_DOC=false
-fi
-
-
 dnl NOTE: We need to use a separate automake conditional for this
 dnl       to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, $ENABLE_GTK_DOC)
+AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 
 dnl borrowed from gnu findutils
 dnl and relicensed as LGPL by the FSF

Attachment: signature.asc
Description: This is a digitally signed message part