# HG changeset patch # User Diego 'Flameeyes' Pettenò <[EMAIL PROTECTED]> # Date 1181406013 -7200 # Node ID ff33f59fb1376d64104853442e4cec2978691fb6 # Parent 158effcf90d8325d88d0a5cb21a3c9cc4bd7c5ed Resurrect the check for xmlto/rsvg (rather than sgmltools/fig2dev) so that the build can be done even without those installed.
diff -r ff33f59fb1376d64104853442e4cec2978691fb6 -r 158effcf90d8325d88d0a5cb21a3c9cc4bd7c5ed configure.ac --- a/configure.ac Sat Jun 09 18:20:13 2007 +0200 +++ b/configure.ac Mon Jun 04 11:38:44 2007 +0200 @@ -1092,6 +1092,16 @@ AC_SUBST(XINE_BUILD_OS) AC_SUBST(XINE_BUILD_OS) AC_SUBST(XINE_BUILD_DATE) + +dnl --------------------------------------------- +dnl Check for documentation formatting tool +dnl --------------------------------------------- + +AC_CHECK_PROG(XMLTO, xmlto, xmlto, no) +AM_CONDITIONAL([HAVE_XMLTO], [test "$XMLTO" != "no"]) + +AC_CHECK_PROG(RSVG, rsvg, rsvg, no) +AM_CONDITIONAL([HAVE_RSVG], [test "$RSVG" != "no"]) dnl --------------------------------------------- dnl Output configuration files diff -r ff33f59fb1376d64104853442e4cec2978691fb6 -r 158effcf90d8325d88d0a5cb21a3c9cc4bd7c5ed doc/faq/Makefile.am --- a/doc/faq/Makefile.am Sat Jun 09 18:20:13 2007 +0200 +++ b/doc/faq/Makefile.am Mon Jun 04 11:38:44 2007 +0200 @@ -7,8 +7,35 @@ EXTRA_DIST = README faq.docbook $(doc_DA DISTCLEANFILES = $(doc_DATA) $(html_DATA) +docs: $(hackersguide_DATA) + +clean-docs: + rm -f $(hackersguide_DATA) + +dist-hook: + @if test x"$(distcheck_lax)" = x ; then \ + $(MAKE) fail_if_missing=yes docs ; \ + else \ + $(MAKE) docs ; \ + fi + +distclean-local: clean-docs + +if HAVE_XMLTO faq.html: faq.docbook - xmlto html-nochunks $(srcdir)/faq.docbook + xmlto html-nochunks $^ faq.txt: faq.docbook - xmlto txt $(srcdir)/faq.docbook + xmlto txt $^ +else +faq.html faq.txt: faq.docbook + if test x"$(fail_if_missing)" = x"yes"; then \ + echo "Please install xmlto."; \ + exit 1; \ + fi + if test x"$(fail_if_missing)" != x"yes"; then \ + touch $@; \ + sleep 1; \ + touch $^; \ + fi +endif diff -r ff33f59fb1376d64104853442e4cec2978691fb6 -r 158effcf90d8325d88d0a5cb21a3c9cc4bd7c5ed doc/hackersguide/Makefile.am --- a/doc/hackersguide/Makefile.am Sat Jun 09 18:20:13 2007 +0200 +++ b/doc/hackersguide/Makefile.am Mon Jun 04 11:38:44 2007 +0200 @@ -21,10 +21,50 @@ EXTRA_DIST = README $(hackersguide_docbo DISTCLEANFILES = $(hackersguide_DATA) +SUFFIXES = .png .fig + +docs: $(hackersguide_DATA) + +clean-docs: + rm -f $(hackersguide_DATA) + +dist-hook: + @if test x"$(distcheck_lax)" = x ; then \ + $(MAKE) fail_if_missing=yes docs ; \ + else \ + $(MAKE) docs ; \ + fi + +distclean-local: clean-docs + +if HAVE_XMLTO hackersguide.html: $(hackersguide_docbook) - xmlto html-nochunks $(srcdir)/hackersguide.docbook + xmlto html-nochunks $^ +else +hackersguide.html: $(hackersguide_docbook) + if test x"$(fail_if_missing)" = x"yes"; then \ + echo "Please install xmlto."; \ + exit 1; \ + fi + if test x"$(fail_if_missing)" != x"yes"; then \ + touch $@; \ + sleep 1; \ + touch $^; \ + fi +endif +if HAVE_RSVG .svg.png: - rsvg -f png $< $@ - -SUFFIXES = .png .fig + rsvg -f png $^ $@ +else +.svg.png: + if test x"$(fail_if_missing)" = x"yes"; then \ + echo "Please install rsvg."; \ + exit 1; \ + fi + if test x"$(fail_if_missing)" != x"yes"; then \ + touch $@; \ + sleep 1; \ + touch $^; \ + fi +endif ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Xine-cvslog mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/xine-cvslog
