libvorbis: add patch to support automake-1.13

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-01-12 17:51:14 +01:00
parent a55a25fac3
commit 8b3f5c7f79
2 changed files with 23 additions and 11 deletions

View File

@ -0,0 +1,12 @@
diff -Naur libvorbis-1.3.3-old/configure.ac libvorbis-1.3.3-new/configure.ac
--- libvorbis-1.3.3-old/configure.ac 2012-02-03 14:00:34.000000000 -0800
+++ libvorbis-1.3.3-new/configure.ac 2013-01-03 20:10:21.000000000 -0800
@@ -13,7 +13,7 @@
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")

View File

@ -1,8 +1,8 @@
diff -Naur libvorbis-1.3.2-old/configure.ac libvorbis-1.3.2-new/configure.ac diff -Naur libvorbis-1.3.3-old/configure.ac libvorbis-1.3.3-new/configure.ac
--- libvorbis-1.3.2-old/configure.ac 2010-11-01 12:27:12.000000000 -0700 --- libvorbis-1.3.3-old/configure.ac 2012-02-03 14:00:34.000000000 -0800
+++ libvorbis-1.3.2-new/configure.ac 2010-11-01 14:50:03.000000000 -0700 +++ libvorbis-1.3.3-new/configure.ac 2012-02-09 12:56:02.000000000 -0800
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
AC_INIT([libvorbis],[1.3.2],[vorbis-dev@xiph.org]) AC_INIT([libvorbis],[1.3.3],[vorbis-dev@xiph.org])
AC_CONFIG_SRCDIR([lib/mdct.c]) AC_CONFIG_SRCDIR([lib/mdct.c])
+AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([m4])
@ -10,19 +10,19 @@ diff -Naur libvorbis-1.3.2-old/configure.ac libvorbis-1.3.2-new/configure.ac
AC_CANONICAL_TARGET([]) AC_CANONICAL_TARGET([])
@@ -16,7 +17,6 @@ @@ -16,7 +17,6 @@
AM_CONFIG_HEADER([config.h]) AC_CONFIG_HEADERS([config.h])
dnl Add parameters for aclocal dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") -AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
dnl Library versioning dnl Library versioning
dnl - library source changed -> increment REVISION dnl - library source changed -> increment REVISION
diff -Naur libvorbis-1.3.2-old/Makefile.am libvorbis-1.3.2-new/Makefile.am diff -Naur libvorbis-1.3.3-old/Makefile.am libvorbis-1.3.3-new/Makefile.am
--- libvorbis-1.3.2-old/Makefile.am 2010-03-25 18:56:25.000000000 -0700 --- libvorbis-1.3.3-old/Makefile.am 2010-12-21 00:46:03.000000000 -0800
+++ libvorbis-1.3.2-new/Makefile.am 2010-11-01 14:50:03.000000000 -0700 +++ libvorbis-1.3.3-new/Makefile.am 2012-02-09 12:56:02.000000000 -0800
@@ -2,6 +2,8 @@ @@ -3,6 +3,8 @@
#AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2 AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
+ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4
+ +