|
@@ -1,9 +1,10 @@
|
|
|
Fix broken autoreconf
|
|
Fix broken autoreconf
|
|
|
|
|
|
|
|
-Downloaded from upstream git
|
|
|
|
|
-https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54
|
|
|
|
|
|
|
+Upstream: https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54
|
|
|
|
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
|
|
|
+[Dario: make the patch to be applied with fuzz factor 0]
|
|
|
|
|
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
From: Tim Terriberry <tterribe@xiph.org>
|
|
From: Tim Terriberry <tterribe@xiph.org>
|
|
@@ -22,9 +23,8 @@ diff --git a/Makefile.am b/Makefile.am
|
|
|
index 89fd753..1783857 100644
|
|
index 89fd753..1783857 100644
|
|
|
--- a/Makefile.am
|
|
--- a/Makefile.am
|
|
|
+++ b/Makefile.am
|
|
+++ b/Makefile.am
|
|
|
-@@ -4,6 +4,8 @@
|
|
|
|
|
- #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2
|
|
|
|
|
- AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
|
|
|
|
|
|
|
+@@ -2,5 +2,7 @@
|
|
|
|
|
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
|
|
|
|
|
|
|
|
+ACLOCAL_AMFLAGS=-I m4
|
|
+ACLOCAL_AMFLAGS=-I m4
|
|
|
+
|
|
+
|
|
@@ -35,7 +35,7 @@ diff --git a/configure.ac b/configure.ac
|
|
|
index 1cbec1a..456b603 100644
|
|
index 1cbec1a..456b603 100644
|
|
|
--- a/configure.ac
|
|
--- a/configure.ac
|
|
|
+++ b/configure.ac
|
|
+++ b/configure.ac
|
|
|
-@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL
|
|
|
|
|
|
|
+@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL
|
|
|
AM_PROG_LIBTOOL
|
|
AM_PROG_LIBTOOL
|
|
|
|
|
|
|
|
dnl Add parameters for aclocal
|
|
dnl Add parameters for aclocal
|
|
@@ -43,4 +43,4 @@ index 1cbec1a..456b603 100644
|
|
|
+AC_CONFIG_MACRO_DIR([m4])
|
|
+AC_CONFIG_MACRO_DIR([m4])
|
|
|
|
|
|
|
|
dnl Check for doxygen
|
|
dnl Check for doxygen
|
|
|
- AC_ARG_ENABLE([doc],
|
|
|
|
|
|
|
+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
|