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