From 82c2f46e0d8b15e9fe45352e4d0cde21c0f181c9 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Wed, 9 Jul 2003 23:22:13 +0000 Subject: [PATCH] check for xmlcatalog for docs build (probably not strictly needed for general use but fixes non-srcdir builds) Original commit message from CVS: check for xmlcatalog for docs build (probably not strictly needed for general use but fixes non-srcdir builds) --- ChangeLog | 5 +++++ common | 2 +- configure.ac | 29 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4a83fdc..c330ca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-07-09 David I. Lehn + + * configure.ac: check for xmlcatalog for docs build (probably not + strictly needed for general use but fixes non-srcdir builds) + 2003-06-26 David I. Lehn * configure.ac, AUTHORS, NEWS, README, TODO, docs/Makefile.am, diff --git a/common b/common index 4e37969..f12ad60 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4e379694ae9ff9843d65cf08928642eea44abdf8 +Subproject commit f12ad60f50de84a39e26901b3ac29c15c1bf954e diff --git a/configure.ac b/configure.ac index d8bc0bb..8d4b866 100644 --- a/configure.ac +++ b/configure.ac @@ -95,6 +95,34 @@ if test "x$GST_INCLUDEDIR" = "x"; then AC_MSG_ERROR(no gstreamer include dir found) fi + +AC_CHECK_PROG(HAVE_XMLTO, xmlto, true, false) +AC_CHECK_PROG(HAVE_XMLCATALOG, xmlcatalog, true, false) + +AC_ARG_ENABLE(docs, +AC_HELP_STRING([--enable-docs],[enable building of documentation]), +[case "${enableval}" in + yes) + if test "x$HAVE_XMLTO" = "xtrue" ; then + BUILD_DOCS=yes + else + AC_MSG_ERROR([you don't have xmlto, so don't use --enable-docs]) + BUILD_DOCS=no + fi + if test "x$HAVE_XMLCATALOG" = "xtrue" ; then + BUILD_DOCS=yes + else + AC_MSG_ERROR([you don't have xmlcatalog, so don't use --enable-docs]) + BUILD_DOCS=no + fi ;; + no) BUILD_DOCS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;; +esac], +[BUILD_DOCS=yes]) dnl Default value + +AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes") + + dnl add debugging options ... changequote(,)dnl if test "x$GCC" = xyes; then @@ -119,5 +147,6 @@ AC_OUTPUT([ examples/Makefile examples/gstreamer/Makefile docs/Makefile + docs/gst-python.ent gst-python.spec ]) -- 2.7.4