70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
diff -pruN a52dec-0.7.4.orig/Makefile.am a52dec-0.7.4/Makefile.am
|
|
--- a52dec-0.7.4.orig/Makefile.am 2011-10-05 15:17:46.538118579 +0000
|
|
+++ a52dec-0.7.4/Makefile.am 2011-10-05 15:18:12.013374560 +0000
|
|
@@ -1,3 +1,5 @@
|
|
+ACLOCAL_AMFLAGS = -I m4
|
|
+
|
|
SUBDIRS = autotools include doc liba52 libao src vc++ test
|
|
|
|
EXTRA_DIST = HISTORY bootstrap
|
|
diff -pruN a52dec-0.7.4.orig/configure.in a52dec-0.7.4/configure.in
|
|
--- a52dec-0.7.4.orig/configure.in 2011-10-05 15:17:46.537119079 +0000
|
|
+++ a52dec-0.7.4/configure.in 2011-10-05 15:18:12.013374560 +0000
|
|
@@ -1,6 +1,7 @@
|
|
dnl Process this file with autoconf to produce a configure script.
|
|
AC_PREREQ(2.52)
|
|
AC_INIT
|
|
+AC_CONFIG_MACRO_DIR([m4])
|
|
AC_CONFIG_SRCDIR([src/a52dec.c])
|
|
AC_CONFIG_AUX_DIR(autotools)
|
|
AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
|
|
@@ -32,15 +33,9 @@ if test x"$GCC" = x"yes"; then
|
|
|
|
dnl arch-specific flags
|
|
case "$host" in
|
|
- i?86-* | k?-*)
|
|
- case "$host" in
|
|
- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
|
|
- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
|
|
- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
|
|
- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
|
|
- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
|
|
- esac
|
|
- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
|
|
+ x86_64-*)
|
|
+ OPT_CFLAGS="$CFLAGS -fPIC"
|
|
+ AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
|
|
sparc-* | sparc64-*)
|
|
OPT_CFLAGS="$CFLAGS -mtune=ultrasparc"
|
|
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
|
|
diff -pruN a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
|
|
--- a52dec-0.7.4.orig/liba52/Makefile.am 2011-10-05 15:17:46.536119579 +0000
|
|
+++ a52dec-0.7.4/liba52/Makefile.am 2011-10-05 15:18:12.014374060 +0000
|
|
@@ -1,4 +1,4 @@
|
|
-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
|
|
+AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
|
|
|
|
lib_LTLIBRARIES = liba52.la
|
|
|
|
diff -pruN a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
|
|
--- a52dec-0.7.4.orig/liba52/configure.incl 2011-10-05 15:17:46.535120079 +0000
|
|
+++ a52dec-0.7.4/liba52/configure.incl 2011-10-05 15:18:32.540106045 +0000
|
|
@@ -2,7 +2,7 @@ AC_SUBST([LIBA52_CFLAGS])
|
|
AC_SUBST([LIBA52_LIBS])
|
|
|
|
dnl avoid -fPIC when possible
|
|
-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
|
|
+dnl LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
|
|
|
|
AC_ARG_ENABLE([double],
|
|
[ --enable-double use double-precision samples])
|
|
diff -pruN a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
|
|
--- a52dec-0.7.4.orig/src/Makefile.am 2011-10-05 15:17:46.535120079 +0000
|
|
+++ a52dec-0.7.4/src/Makefile.am 2011-10-05 15:18:12.014374060 +0000
|
|
@@ -1,4 +1,4 @@
|
|
-CFLAGS = @A52DEC_CFLAGS@
|
|
+AM_CFLAGS = @A52DEC_CFLAGS@
|
|
|
|
bin_PROGRAMS = a52dec extract_a52
|
|
a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
|