Attachment #120688 for bug #167704




dnl
dnl  Shall we build documentation?
dnl
AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], [Don't build API documentation with Doxygen]))

if test "x$enable_doc" != "xno"; then
	AC_PATH_PROG(DOXYGEN, doxygen, no)
	# Gentoo hack: latex not required
	#AC_PATH_PROG(LATEX, latex, no)
	LATEX="no"
else
	DOXYGEN="no"
	LATEX="no"
fi
AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")
AC_PATH_PROG(LATEX, latex, no)
AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")

AC_OUTPUT([

Lines 364-369 Link Here

(-)libdvdcss-1.2.9/doc/doxygen.cfg (-1 / +5 lines)
364	INPUT = ../src/dvdcss/dvdcss.h \	364	INPUT = ../src/dvdcss/dvdcss.h \
365	../src/libdvdcss.c	365	../src/libdvdcss.c
366		366
		367	# The INPUT_ENCODING tag sets the character encoding of the input files.
		368
		369	INPUT_ENCODING = ISO-8859-1
		370
367	# If the value of the INPUT tag contains directories, you can use the	371	# If the value of the INPUT tag contains directories, you can use the
368	# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp	372	# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
369	# and *.h) to filter out the source-files in the directories. If left	373	# and *.h) to filter out the source-files in the directories. If left
Lines 616-622 Link Here
616	# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will	620	# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
617	# generate Latex output.	621	# generate Latex output.
618		622
619	GENERATE_LATEX = YES	623	GENERATE_LATEX = NO
620		624
621	# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.	625	# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
622	# If a relative path is entered the value of OUTPUT_DIRECTORY will be	626	# If a relative path is entered the value of OUTPUT_DIRECTORY will be

Lines 1-7 Link Here

(-)libdvdcss-1.2.9/doc/header.html (-1 / +1 lines)
1	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">	1	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2	<html>	2	<html>
3	<head>	3	<head>
4	<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">	4	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
5	<title>libdvdcss documentation</title>	5	<title>libdvdcss documentation</title>
6	<link href="/main.css" rel="stylesheet" type="text/css">	6	<link href="/main.css" rel="stylesheet" type="text/css">
7	<link href="/doxygen.css" rel="stylesheet" type="text/css">	7	<link href="/doxygen.css" rel="stylesheet" type="text/css">

Return to bug 167704

Lines 191-199 Link Here

(-)libdvdcss-1.2.9/configure.ac (-2 / +11 lines)
191	dnl	191	dnl
192	dnl Shall we build documentation?	192	dnl Shall we build documentation?
193	dnl	193	dnl
194	AC_PATH_PROG(DOXYGEN, doxygen, no)	194	AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], [Don't build API documentation with Doxygen]))
		195
		196	if test "x$enable_doc" != "xno"; then
		197	AC_PATH_PROG(DOXYGEN, doxygen, no)
		198	# Gentoo hack: latex not required
		199	#AC_PATH_PROG(LATEX, latex, no)
		200	LATEX="no"
		201	else
		202	DOXYGEN="no"
		203	LATEX="no"
		204	fi
195	AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")	205	AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")
196	AC_PATH_PROG(LATEX, latex, no)
197	AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")	206	AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")
198		207
199	AC_OUTPUT([	208	AC_OUTPUT([