Mercurial > mxe-octave
annotate src/lame-2-update-autotools.patch @ 3725:2acaa9943159
qscintilla: update 2.8.4
* src/qscintilla.mk: update to version and checksum for 2.8.4
author | John Donoghue |
---|---|
date | Mon, 20 Oct 2014 11:01:00 -0400 |
parents | 2b24e408ea4a |
children |
rev | line source |
---|---|
3621
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 This file is part of MXE. |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
2 See index.html for further information. |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
3 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
4 This patch has been taken from: |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 https://github.com/rbrito/lame/commit/a6552b532919dcc2fbfb32d1dfdaab80c1534200 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
6 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 From a6552b532919dcc2fbfb32d1dfdaab80c1534200 Mon Sep 17 00:00:00 2001 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 From: Rogério Brito <rbrito@ime.usp.br> |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
9 Date: Wed, 12 Jun 2013 09:16:29 +0000 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 Subject: [PATCH] Make autotools files compatible with automake >= 1.12 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
11 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
12 Newer autotools versions don't seem to support ansi2knr, which is probably |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
13 not a problem, given the last decades of compilers accepting ANSI C (and the |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
14 rest of the LAME code being written in ANSI C itself). |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
16 This fixes ticket #60, with a patch of Brennan Shacklett, from the Gentoo |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 community. |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 --- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
19 aclocal.m4 | 17 ----------------- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 configure.in | 3 --- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
21 doc/html/Makefile.am | 2 +- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 doc/man/Makefile.am | 3 +-- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
23 libmp3lame/i386/Makefile.am | 2 +- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
24 5 files changed, 3 insertions(+), 24 deletions(-) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
25 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
26 diff --git a/aclocal.m4 b/aclocal.m4 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
27 index fc53243..4d9ad71 100644 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
28 --- a/aclocal.m4 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
29 +++ b/aclocal.m4 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
30 @@ -10530,23 +10530,6 @@ AC_DEFUN([_AM_IF_OPTION], |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
31 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
32 # serial 5 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
33 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
34 -AC_DEFUN([AM_C_PROTOTYPES], |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
35 -[AC_REQUIRE([AC_C_PROTOTYPES]) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
36 -if test "$ac_cv_prog_cc_stdc" != no; then |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
37 - U= ANSI2KNR= |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
38 -else |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
39 - U=_ ANSI2KNR=./ansi2knr |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
40 -fi |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
41 -# Ensure some checks needed by ansi2knr itself. |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
42 -AC_REQUIRE([AC_HEADER_STDC]) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
43 -AC_CHECK_HEADERS([string.h]) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
44 -AC_SUBST([U])dnl |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
45 -AC_SUBST([ANSI2KNR])dnl |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
46 -_AM_SUBST_NOTMAKE([ANSI2KNR])dnl |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
47 -]) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
48 - |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
49 -AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
50 - |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
51 # Check to make sure that the build environment is sane. -*- Autoconf -*- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
52 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
53 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
54 diff --git a/configure.in b/configure.in |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
55 index 24ca884..6f5c1c6 100644 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
56 --- a/configure.in |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
57 +++ b/configure.in |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
58 @@ -77,9 +77,6 @@ if test "${GCC}" = "yes"; then |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
59 AC_MSG_RESULT(${GCC_version}) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
60 fi |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
61 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
62 -dnl more automake stuff |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
63 -AM_C_PROTOTYPES |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
64 - |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
65 AC_CHECK_HEADER(dmalloc.h) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
66 if test "${ac_cv_header_dmalloc_h}" = "yes"; then |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
67 AM_WITH_DMALLOC |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
68 diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
69 index aa76785..09d26c2 100644 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
70 --- a/doc/html/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
71 +++ b/doc/html/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
72 @@ -1,6 +1,6 @@ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
73 ## $Id$ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
74 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
75 -AUTOMAKE_OPTIONS = foreign ansi2knr |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
76 +AUTOMAKE_OPTIONS = foreign |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
77 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
78 docdir = $(datadir)/doc |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
79 pkgdocdir = $(docdir)/$(PACKAGE) |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
80 diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
81 index 05182b5..dac00a3 100644 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
82 --- a/doc/man/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
83 +++ b/doc/man/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
84 @@ -1,7 +1,6 @@ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
85 ## $Id$ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
86 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
87 -AUTOMAKE_OPTIONS = foreign ansi2knr |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
88 +AUTOMAKE_OPTIONS = foreign |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
89 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
90 man_MANS = lame.1 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
91 EXTRA_DIST = ${man_MANS} |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
92 - |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
93 diff --git a/libmp3lame/i386/Makefile.am b/libmp3lame/i386/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
94 index 032c2b2..c51912e 100644 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
95 --- a/libmp3lame/i386/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
96 +++ b/libmp3lame/i386/Makefile.am |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
97 @@ -1,6 +1,6 @@ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
98 ## $Id$ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
99 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
100 -AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
101 +AUTOMAKE_OPTIONS = foreign |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
102 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
103 DEFS = @DEFS@ @CONFIG_DEFS@ |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
104 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
105 -- |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
106 1.9.1 |
2b24e408ea4a
lame: update version from mxe_devel
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
107 |