mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Correctly check for XML tools. Correctly set

Browse source 
Original commit message from CVS:
* configure.ac:  Correctly check for XML tools.  Correctly set
BUILD_DOCS variable depending on tools.
* docs/Makefile.am:  Use XML variables.
This commit is contained in:
David Schleef 2004-07-03 04:13:22 +00:00
parent fb892000aa
commit 39381dbd87
3 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-07-02 David Schleef <ds@schleef.org>
* configure.ac: Correctly check for XML tools. Correctly set
BUILD_DOCS variable depending on tools.
* docs/Makefile.am: Use XML variables.
2004-06-21 Thomas Vander Stichele <thomas at apestaart dot org> 2004-06-21 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: back to cvs * configure.ac: back to cvs

44
configure.ac
View file

@ -107,29 +107,47 @@ dnl AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes")
dnl AC_SUBST(GST_EDITOR_CFLAGS) dnl AC_SUBST(GST_EDITOR_CFLAGS)
dnl AC_SUBST(GST_EDITOR_LIBS) dnl AC_SUBST(GST_EDITOR_LIBS)
AC_CHECK_PROG(HAVE_XMLTO, xmlto, true, false) BUILD_DOCS=yes
AC_CHECK_PROG(HAVE_XMLCATALOG, xmlcatalog, true, false) AC_CHECK_PROG(XMLTO, xmlto, xmlto, no)
if test "x$XMLTO" = xno ; then
BUILD_DOCS=no
fi
AC_SUBST(XMLTO)
AC_CHECK_PROG(XMLCATALOG, xmlcatalog, xmlcatalog, no)
if test "x$XMLCATALOG" = xno ; then
BUILD_DOCS=no
fi
AC_SUBST(XMLCATALOG)
AC_CHECK_PROG(XMLLINT, xmllint, xmllint, no)
if test "x$XMLLINT" = xno ; then
BUILD_DOCS=no
fi
AC_SUBST(XMLLINT)
AC_ARG_ENABLE(docs, AC_ARG_ENABLE(docs,
AC_HELP_STRING([--enable-docs],[enable building of documentation]), AC_HELP_STRING([--enable-docs],[enable building of documentation]),
[case "${enableval}" in [case "${enableval}" in
yes) yes)
if test "x$HAVE_XMLTO" = "xtrue" ; then if test "x$XMLTO" = "xno" ; then
BUILD_DOCS=yes
else
AC_MSG_ERROR([you don't have xmlto, so don't use --enable-docs]) AC_MSG_ERROR([you don't have xmlto, so don't use --enable-docs])
BUILD_DOCS=no BUILD_DOCS=no
fi fi
if test "x$HAVE_XMLCATALOG" = "xtrue" ; then if test "x$XMLCATALOG" = "xno" ; then
BUILD_DOCS=yes
else
AC_MSG_ERROR([you don't have xmlcatalog, so don't use --enable-docs]) AC_MSG_ERROR([you don't have xmlcatalog, so don't use --enable-docs])
BUILD_DOCS=no BUILD_DOCS=no
fi ;; fi
no) BUILD_DOCS=no ;; if test "x$XMLLINT" = "xno" ; then
*) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;; AC_MSG_ERROR([you don't have xmllint, so don't use --enable-docs])
esac], BUILD_DOCS=no
[BUILD_DOCS=yes]) dnl Default value fi
;;
no)
BUILD_DOCS=no
;;
*)
AC_MSG_ERROR(bad value ${enableval} for --enable-docs)
;;
esac])
AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes") AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes")

8
docs/Makefile.am
View file

@ -18,17 +18,15 @@ CLEANFILES = $(DOCS) $(TOPDOCS) $(RELNOTES) tmpbuildcatalog
if BUILD_DOCS if BUILD_DOCS
XMLTO = xmlto
XMLTOFLAGS = --skip-validation -o $(CURDIR) XMLTOFLAGS = --skip-validation -o $(CURDIR)
XMLLINT = xmllint
XMLLINTFLAGS = --xinclude --noout --loaddtd --catalogs --postvalid XMLLINTFLAGS = --xinclude --noout --loaddtd --catalogs --postvalid
all: $(DOCS) all: $(DOCS)
tmpbuildcatalog: gst-python.ent tmpbuildcatalog: gst-python.ent
xmlcatalog --noout --create $@ $(XMLCATALOG) --noout --create $@
xmlcatalog --noout --add system `cd $(srcdir) && pwd`/gst-python.ent $(CURDIR)/gst-python.ent $@ $(XMLCATALOG) --noout --add system `cd $(srcdir) && pwd`/gst-python.ent $(CURDIR)/gst-python.ent $@
xmlcatalog --noout --add system $(srcdir)/gst-python.ent $(CURDIR)/gst-python.ent $@ $(XMLCATALOG) --noout --add system $(srcdir)/gst-python.ent $(CURDIR)/gst-python.ent $@
#check: tmpbuildcatalog #check: tmpbuildcatalog
# for d in $(XMLFILES); do \ # for d in $(XMLFILES); do \