From 25a54477a07443bde67cba3bb55eb1dab1fd4309 Mon Sep 17 00:00:00 2001
From: Frederic Peters <fpeters@entrouvert.com>
Date: Thu, 10 Feb 2005 09:48:58 +0000
Subject: [PATCH] reworked a bit documentation build system and added detection
 of inkscape and xsltproc in configure

---
 Makefile.am                         |  5 +----
 configure.ac                        | 15 +++++++++++----
 docs/Makefile.am                    |  6 ++++--
 docs/lasso-book/Makefile.am         |  4 ++++
 docs/lasso-book/figures/Makefile.am |  4 ++--
 docs/reference/tmpl/login.sgml      | 22 ++++++++++++++++++++++
 docs/reference/tmpl/profile.sgml    |  4 ++++
 docs/reference/tmpl/server.sgml     | 23 +++++++++++++++++++++++
 8 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 60ba738e..4f1b420a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,16 +13,13 @@ endif
 if PERL_ENABLED
     PERL_SD = perl
 endif
-if GTK_DOC_ENABLED
-    GTK_DOC_SD = docs
-endif
 
 SUBDIRS		= lasso \
 		  $(PHP_SD) $(PYTHON_SD) $(JAVA_SD) $(CSHARP_SD) $(PERL_SD) \
 		  tests \
 		  swig \
 		  win32 \
-		  $(GTK_DOC_SD)
+		  docs
 
 ABS_BUILDDIR	= $(shell pwd)
 
diff --git a/configure.ac b/configure.ac
index 0865278e..688292fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -615,10 +615,6 @@ else
 fi
 AC_SUBST(HTML_DIR)
 
-AC_CHECK_PROGS(REST2HTML, rest2html)
-
-AM_CONDITIONAL(HAVE_REST2HTML, test -n "$ac_cv_prog_REST2HTML")
-
 
 dnl pkg-config path
 AC_ARG_WITH(pkg-config, [  --with-pkg-config=PATH set pkg-config metadata search path.],
@@ -641,6 +637,17 @@ fi
 dnl Conditional docs sub dir test.
 AM_CONDITIONAL([GTK_DOC_ENABLED],[test "x$enable_gtk_doc" = "xyes"])
 
+
+AC_CHECK_PROGS(REST2HTML, rest2html)
+AM_CONDITIONAL(HAVE_REST2HTML, test -n "$ac_cv_prog_REST2HTML")
+
+AC_CHECK_PROGS(XSLTPROC, xsltproc)
+AM_CONDITIONAL(HAVE_XSLTPROC, test -n "$ac_cv_prog_XSLTPROC")
+
+AC_CHECK_PROGS(INKSCAPE, inkscape)
+AM_CONDITIONAL(HAVE_INKSCAPE, test -n "$ac_cv_prog_INKSCAPE")
+
+
 dnl Debug 
 AC_MSG_CHECKING(for debugging) 
 AC_ARG_ENABLE(debugging,   [  --enable-debugging      enable debuging messages (no)])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index aa37fdf7..b2c5627c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,6 @@
-## Process this file with automake to produce Makefile.in
+if GTK_DOC_ENABLED
+    GTK_DOC_SD = reference
+endif
 
-SUBDIRS = lasso-book reference
+SUBDIRS = lasso-book $(GTK_DOC_SD)
 
diff --git a/docs/lasso-book/Makefile.am b/docs/lasso-book/Makefile.am
index 6025af9e..c837cc2d 100644
--- a/docs/lasso-book/Makefile.am
+++ b/docs/lasso-book/Makefile.am
@@ -1,4 +1,8 @@
+if HAVE_INKSCAPE
+if HAVE_XSLTPROC
 SUBDIRS = figures
+endif
+endif
 
 docdir = $(datadir)/doc/lasso
 
diff --git a/docs/lasso-book/figures/Makefile.am b/docs/lasso-book/figures/Makefile.am
index 11fb0479..8145e516 100644
--- a/docs/lasso-book/figures/Makefile.am
+++ b/docs/lasso-book/figures/Makefile.am
@@ -23,11 +23,11 @@ figures_DATA = $(FIGURES_PNG_FILES)
 CLEANFILES = $(FIGURES_PNG_FILES) $(FIGURES_SVG_FILES)
 
 %.svg:
-	xsltproc --stringparam stepno `echo $@ | sed -e 's/[^0-9]//g'` $(srcdir)/step.xsl \
+	$(XSLTPROC) --stringparam stepno `echo $@ | sed -e 's/[^0-9]//g'` $(srcdir)/step.xsl \
 		$< > $@
 
 %.png: %.svg
-	inkscape -d 150 --export-png=$@ $<
+	$(INKSCAPE) -d 150 --export-png=$@ $<
 
 
 sso-brws-art-1.svg: sso-brws-art.svg step.xsl
diff --git a/docs/reference/tmpl/login.sgml b/docs/reference/tmpl/login.sgml
index 0479dd48..e6992614 100644
--- a/docs/reference/tmpl/login.sgml
+++ b/docs/reference/tmpl/login.sgml
@@ -356,3 +356,25 @@ Identifies the two possible profiles for Single Sign-On and Federation.
 @Returns: 
 
 
+<!-- ##### FUNCTION lasso_login_set_encryptedResourceId ##### -->
+<para>
+
+</para>
+
+@login: 
+@encryptedResourceId: 
+@Returns: 
+
+
+<!-- ##### FUNCTION lasso_login_set_resourceId ##### -->
+<para>
+
+</para>
+
+@login: 
+@content: 
+@Returns: 
+<!-- # Unused Parameters # -->
+@resourceId: 
+
+
diff --git a/docs/reference/tmpl/profile.sgml b/docs/reference/tmpl/profile.sgml
index 4b4b578d..cb0343ff 100644
--- a/docs/reference/tmpl/profile.sgml
+++ b/docs/reference/tmpl/profile.sgml
@@ -38,6 +38,10 @@ Base class for all ID-FF profiles
 @LASSO_REQUEST_TYPE_NAME_REGISTRATION: 
 @LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING: 
 @LASSO_REQUEST_TYPE_LECP: 
+@LASSO_REQUEST_TYPE_DISCO_QUERY: 
+@LASSO_REQUEST_TYPE_DISCO_MODIFY: 
+@LASSO_REQUEST_TYPE_DST_QUERY: 
+@LASSO_REQUEST_TYPE_DST_MODIFY: 
 
 <!-- ##### STRUCT LassoProfile ##### -->
 <para>
diff --git a/docs/reference/tmpl/server.sgml b/docs/reference/tmpl/server.sgml
index 1a6465cc..4924f1c6 100644
--- a/docs/reference/tmpl/server.sgml
+++ b/docs/reference/tmpl/server.sgml
@@ -61,6 +61,19 @@ certificates to use, etc.
 @Returns: 
 
 
+<!-- ##### FUNCTION lasso_server_add_service ##### -->
+<para>
+
+</para>
+
+@server: 
+@service: 
+@Returns: 
+<!-- # Unused Parameters # -->
+@service_type: 
+@service_endpoint: 
+
+
 <!-- ##### FUNCTION lasso_server_destroy ##### -->
 <para>
 
@@ -88,3 +101,13 @@ certificates to use, etc.
 @Returns: 
 
 
+<!-- ##### FUNCTION lasso_server_get_service ##### -->
+<para>
+
+</para>
+
+@server: 
+@serviceType: 
+@Returns: 
+
+