shishi ./configure.ac ./Makefile.am m4/Makefile...

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/11/01 19:58:27

Modified files:
        .              : configure.ac Makefile.am 
        m4             : Makefile.am 
Added files:
        m4             : gtk-doc.m4 

Log message:
        Use gtk-doc.m4 for GTK-DOC stuff.
        Add DocBook checks.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/configure.ac.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/Makefile.am.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/m4/gtk-doc.m4?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/m4/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: shishi/Makefile.am
diff -u shishi/Makefile.am:1.49 shishi/Makefile.am:1.50
--- shishi/Makefile.am:1.49     Sat Oct 25 13:57:38 2003
+++ shishi/Makefile.am  Sat Nov  1 19:58:26 2003
@@ -18,8 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-DISTCHECK_CONFIGURE_FLAGS = \
-       --disable-gtk-doc --without-system-asn1 --without-libgcrypt
+DISTCHECK_CONFIGURE_FLAGS = --without-system-asn1 --without-libgcrypt
 
 SUBDIRS = m4 po gl
 
Index: shishi/configure.ac
diff -u shishi/configure.ac:1.103 shishi/configure.ac:1.104
--- shishi/configure.ac:1.103   Sat Nov  1 08:18:02 2003
+++ shishi/configure.ac Sat Nov  1 19:58:26 2003
@@ -299,39 +299,13 @@
 AM_CONDITIONAL(STARTTLS, test "$starttls" != "no")
 
 # Check for gtk-doc.
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-gtk_doc_min_version=0.6
-if $GTKDOC ; then 
-    gtk_doc_version=`gtkdoc-mkdb --version`
-    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= 
$gtk_doc_min_version])
-    if perl <<EOF ; then
-      exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &&
-            ("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1);
-EOF
-      AC_MSG_RESULT(yes)
-   else
-      AC_MSG_RESULT(no)
-      GTKDOC=false
-   fi
-fi
+GTK_DOC_CHECK(1.1)
 
-# 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)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no 
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+# Docbook
+AM_MISSING_PROG(DOCBOOK2HTML, docbook2html, $missing_dir)
+AM_MISSING_PROG(DOCBOOK2TXT, docbook2txt, $missing_dir)
+AM_MISSING_PROG(DOCBOOK2PDF, docbook2pdf, $missing_dir)
+AM_MISSING_PROG(DOCBOOK2PS, docbook2ps, $missing_dir)
 
 # Let people enable/disable various encryption/checksum types.
 AC_ARG_ENABLE(des, AC_HELP_STRING([--disable-des],
Index: shishi/m4/Makefile.am
diff -u shishi/m4/Makefile.am:1.5 shishi/m4/Makefile.am:1.6
--- shishi/m4/Makefile.am:1.5   Sat Oct  4 12:37:27 2003
+++ shishi/m4/Makefile.am       Sat Nov  1 19:58:26 2003
@@ -22,5 +22,5 @@
        inttypes_h.m4 inttypes.m4 inttypes-pri.m4 isc-posix.m4          \
        lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 pkg.m4  \
        po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4         \
-       ax_create_stdint_h.m4 ac_compile_check_sizeof.m4 libgnutls.m4   \
-       libgcrypt.m4
+       ax_create_stdint_h.m4 ac_compile_check_sizeof.m4 libgnutls.m4   \
+       libgcrypt.m4 gtk-doc.m4