blob: c44766faa02af7c28a583df71e94835f9b5d9ba1 (
plain)
1 diff -pruN a52dec-0.7.4.orig/Makefile.am a52dec-0.7.4/Makefile.am
2 --- a52dec-0.7.4.orig/Makefile.am 2011-10-05 15:17:46.538118579 +0000
3 +++ a52dec-0.7.4/Makefile.am 2011-10-05 15:18:12.013374560 +0000
4 @@ -1,3 +1,5 @@
5 +ACLOCAL_AMFLAGS = -I m4
6 +
7 SUBDIRS = autotools include doc liba52 libao src vc++ test
8
9 EXTRA_DIST = HISTORY bootstrap
10 diff -pruN a52dec-0.7.4.orig/configure.in a52dec-0.7.4/configure.in
11 --- a52dec-0.7.4.orig/configure.in 2011-10-05 15:17:46.537119079 +0000
12 +++ a52dec-0.7.4/configure.in 2011-10-05 15:18:12.013374560 +0000
13 @@ -1,6 +1,7 @@
14 dnl Process this file with autoconf to produce a configure script.
15 AC_PREREQ(2.52)
16 AC_INIT
17 +AC_CONFIG_MACRO_DIR([m4])
18 AC_CONFIG_SRCDIR([src/a52dec.c])
19 AC_CONFIG_AUX_DIR(autotools)
20 AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
21 @@ -32,15 +33,9 @@ if test x"$GCC" = x"yes"; then
22
23 dnl arch-specific flags
24 case "$host" in
25 - i?86-* | k?-*)
26 - case "$host" in
27 - i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
28 - i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
29 - i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
30 - i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
31 - k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
32 - esac
33 - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
34 + x86_64-*)
35 + OPT_CFLAGS="$CFLAGS -fPIC"
36 + AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
37 sparc-* | sparc64-*)
38 OPT_CFLAGS="$CFLAGS -mtune=ultrasparc"
39 AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
40 diff -pruN a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
41 --- a52dec-0.7.4.orig/liba52/Makefile.am 2011-10-05 15:17:46.536119579 +0000
42 +++ a52dec-0.7.4/liba52/Makefile.am 2011-10-05 15:18:12.014374060 +0000
43 @@ -1,4 +1,4 @@
44 -CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
45 +AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
46
47 lib_LTLIBRARIES = liba52.la
48
49 diff -pruN a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
50 --- a52dec-0.7.4.orig/liba52/configure.incl 2011-10-05 15:17:46.535120079 +0000
51 +++ a52dec-0.7.4/liba52/configure.incl 2011-10-05 15:18:32.540106045 +0000
52 @@ -2,7 +2,7 @@ AC_SUBST([LIBA52_CFLAGS])
53 AC_SUBST([LIBA52_LIBS])
54
55 dnl avoid -fPIC when possible
56 -LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
57 +dnl LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
58
59 AC_ARG_ENABLE([double],
60 [ --enable-double use double-precision samples])
61 diff -pruN a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
62 --- a52dec-0.7.4.orig/src/Makefile.am 2011-10-05 15:17:46.535120079 +0000
63 +++ a52dec-0.7.4/src/Makefile.am 2011-10-05 15:18:12.014374060 +0000
64 @@ -1,4 +1,4 @@
65 -CFLAGS = @A52DEC_CFLAGS@
66 +AM_CFLAGS = @A52DEC_CFLAGS@
67
68 bin_PROGRAMS = a52dec extract_a52
69 a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
|
