70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
|
Various patches to fix autoreconf errors.
|
||
|
|
|
||
|
|
All patches besides
|
||
|
|
- AM_ICONV in configure.in
|
||
|
|
are already applied upstream:
|
||
|
|
http://lame.cvs.sourceforge.net/viewvc/lame/lame/configure.in?r1=1.145&r2=1.146
|
||
|
|
http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/html/Makefile.am?r1=1.8&r2=1.9
|
||
|
|
http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/man/Makefile.am?r1=1.1&r2=1.2
|
||
|
|
|
||
|
|
libmp3lame/i386/Makefile.am patch ported from Debian
|
||
|
|
http://anonscm.debian.org/cgit/pkg-multimedia/lame.git/tree/debian/patches/ansi2knr2devnull.patch
|
||
|
|
|
||
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
|
|
|
||
|
|
diff -uNr lame-3.99.5.org/configure.in lame-3.99.5/configure.in
|
||
|
|
--- lame-3.99.5.org/configure.in 2012-02-28 19:50:27.000000000 +0100
|
||
|
|
+++ lame-3.99.5/configure.in 2015-04-11 11:36:15.464835008 +0200
|
||
|
|
@@ -77,9 +77,6 @@
|
||
|
|
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
|
||
|
|
@@ -376,8 +373,6 @@
|
||
|
|
AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
|
||
|
|
AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
|
||
|
|
|
||
|
|
-AM_ICONV
|
||
|
|
-
|
||
|
|
dnl math lib
|
||
|
|
AC_CHECK_LIB(m, cos, USE_LIBM="-lm")
|
||
|
|
dnl free fast math library
|
||
|
|
diff -uNr lame-3.99.5.org/doc/html/Makefile.am lame-3.99.5/doc/html/Makefile.am
|
||
|
|
--- lame-3.99.5.org/doc/html/Makefile.am 2010-09-30 22:58:40.000000000 +0200
|
||
|
|
+++ lame-3.99.5/doc/html/Makefile.am 2015-04-11 11:37:02.880239754 +0200
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
|
||
|
|
|
||
|
|
-AUTOMAKE_OPTIONS = foreign ansi2knr
|
||
|
|
+AUTOMAKE_OPTIONS = foreign
|
||
|
|
|
||
|
|
docdir = $(datadir)/doc
|
||
|
|
pkgdocdir = $(docdir)/$(PACKAGE)
|
||
|
|
diff -uNr lame-3.99.5.org/doc/man/Makefile.am lame-3.99.5/doc/man/Makefile.am
|
||
|
|
--- lame-3.99.5.org/doc/man/Makefile.am 2000-10-22 13:39:44.000000000 +0200
|
||
|
|
+++ lame-3.99.5/doc/man/Makefile.am 2015-04-11 11:37:08.704167318 +0200
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
|
||
|
|
|
||
|
|
-AUTOMAKE_OPTIONS = foreign ansi2knr
|
||
|
|
+AUTOMAKE_OPTIONS = foreign
|
||
|
|
|
||
|
|
man_MANS = lame.1
|
||
|
|
EXTRA_DIST = ${man_MANS}
|
||
|
|
diff -uNr lame-3.99.5.org/libmp3lame/i386/Makefile.am lame-3.99.5/libmp3lame/i386/Makefile.am
|
||
|
|
--- lame-3.99.5.org/libmp3lame/i386/Makefile.am 2011-04-04 11:42:34.000000000 +0200
|
||
|
|
+++ lame-3.99.5/libmp3lame/i386/Makefile.am 2015-04-11 11:37:35.191833351 +0200
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
|
||
|
|
|
||
|
|
-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
|
||
|
|
+AUTOMAKE_OPTIONS = foreign
|
||
|
|
|
||
|
|
DEFS = @DEFS@ @CONFIG_DEFS@
|
||
|
|
|