[vlc-devel] commit: Don't build theora API documentation. (Jean-Paul Saman )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Tue Oct  7 10:53:28 2008 +0200| [0311dd5c69d7fd68e819ccb60a37b2417821a3e4] | committer: Jean-Paul Saman 

Don't build theora API documentation.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0311dd5c69d7fd68e819ccb60a37b2417821a3e4
---

 extras/contrib/src/Makefile             |    2 +-
 extras/contrib/src/Patches/theora.patch |   60 ++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8f2471b..84b2238 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -786,7 +786,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifdef HAVE_BEOS
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples --disable-doc && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@
diff --git a/extras/contrib/src/Patches/theora.patch b/extras/contrib/src/Patches/theora.patch
index 6e747b8..2f98e1c 100644
--- a/extras/contrib/src/Patches/theora.patch
+++ b/extras/contrib/src/Patches/theora.patch
@@ -1,6 +1,6 @@
---- libtheora/configure.ac	2007-09-18 08:47:09.000000000 +0200
-+++ libtheora.new/configure.ac	2007-09-23 14:44:48.000000000 +0200
-@@ -93,7 +93,7 @@
+--- libtheora/configure.ac.orig	2008-04-16 22:25:55.000000000 +0200
++++ libtheora/configure.ac	2008-10-07 10:06:22.000000000 +0200
+@@ -147,7 +147,7 @@ if test -z "$GCC"; then
          case $host in 
          *)
                  DEBUG="-g -DDEBUG"
@@ -9,7 +9,7 @@
                  PROFILE="-g -p -DDEBUG" ;;
          esac
  else
-@@ -101,11 +101,11 @@
+@@ -155,11 +155,11 @@ else
          case $host in 
          *)
                  DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
@@ -23,3 +23,55 @@
  
  cpu_x86_64=no
  cpu_x86_32=no
+@@ -351,6 +351,12 @@ AC_ARG_ENABLE(examples,
+      [ ac_enable_examples=$enableval ], [ ac_enable_examples=yes] )
+ AM_CONDITIONAL(THEORA_ENABLE_EXAMPLES, [test "x${ac_enable_examples}" != xno])
+ 
++ac_enable_doc=yes
++AC_ARG_ENABLE(doc,
++     [  --disable-doc            disable doc ],
++     [ ac_enable_doc=$enableval ], [ac_enable_doc=yes ] )
++AM_CONDITIONAL(THEORA_ENABLE_DOC, [test "x${ac_enable_doc}" != xno])
++
+ dnl --------------------------------------------------
+ dnl Check for headers
+ dnl --------------------------------------------------
+@@ -410,7 +416,7 @@ AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+ AS_AC_EXPAND(BINDIR, ${bindir})
+ AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+ 
+-if test $HAVE_DOXYGEN = "false"; then
++if test $HAVE_DOXYGEN = "false" -o "x${ac_enable_doc}" = xno; then
+   doc_build="no"
+ else
+   doc_build="yes"
+--- libtheora/Makefile.am.orig	2008-10-07 10:01:12.000000000 +0200
++++ libtheora/Makefile.am	2008-10-07 10:00:36.000000000 +0200
+@@ -8,7 +8,13 @@ else
+ EXAMPLES_DIR =
+ endif
+ 
+-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
++if THEORA_ENABLE_DOC
++DOC_DIR = doc
++else
++DOC_DIR =
++endif
++
++SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
+ 
+ 
+ # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+--- libtheora/Makefile.in.orig	2008-10-07 10:21:32.000000000 +0200
++++ libtheora/Makefile.in	2008-10-07 10:21:05.000000000 +0200
+@@ -245,7 +245,9 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
+ @THEORA_ENABLE_EXAMPLES_FALSE at EXAMPLES_DIR = 
+ @THEORA_ENABLE_EXAMPLES_TRUE at EXAMPLES_DIR = examples
+-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
++ at THEORA_ENABLE_DOC_FALSE@DOC_DIR=
++ at THEORA_ENABLE_DOC_TRUE@DOC_DIR=doc
++SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
+ 
+ # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+ # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am