diff options
| author | Rocky Bernstein <rockyb@users.sourceforge.net> | 2004-02-19 02:50:24 +0000 |
|---|---|---|
| committer | Rocky Bernstein <rockyb@users.sourceforge.net> | 2004-02-19 02:50:24 +0000 |
| commit | 5cb036aff44c2ff274ec38b28382245c5f695689 (patch) | |
| tree | b55f5f42c0cf359faddca2c2724bd41e626f8cdf /m4/alsa.m4 | |
| parent | 8aec8d2b5344d4f748755cfb328fd811a8bfc526 (diff) | |
| download | xine-lib-5cb036aff44c2ff274ec38b28382245c5f695689.tar.gz xine-lib-5cb036aff44c2ff274ec38b28382245c5f695689.tar.bz2 | |
Mandrake patches from
http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/
via Goetz Waschk who reports:
The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative
CFLAGS for amd64,
the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded
/lib to support the lib64 library dir on amd64,
the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a
configure option to disable directfb,
the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same
for linux framebuffer and
the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't
apply at the moment against the CVS -- demux_ogg.c was not applied.
it includes some 64 bit pointer and other fixes for 64bit architectures.
from Gwenole Beauchesne
I haven't tested other than apply and compile.
CVS patchset: 6174
CVS date: 2004/02/19 02:50:24
Diffstat (limited to 'm4/alsa.m4')
| -rw-r--r-- | m4/alsa.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/alsa.m4 b/m4/alsa.m4 index eca833472..885b66386 100644 --- a/m4/alsa.m4 +++ b/m4/alsa.m4 @@ -47,12 +47,12 @@ AC_DEFUN([AM_PATH_ALSA], if test x"$enable_alsa" != "xno"; then if test x$alsa_prefix != x ; then - ALSA_LIBS="-L$alsa_prefix/lib" + ALSA_LIBS="-L$alsa_prefix/$XINE_LIBNAME" ALSA_STATIC_LIB="$alsa_prefix" ALSA_CFLAGS="-I$alsa_prefix/include" fi if test x$alsa_exec_prefix != x ; then - ALSA_LIBS="-L$alsa_exec_prefix/lib" + ALSA_LIBS="-L$alsa_exec_prefix/$XINE_LIBNAME" ALSA_STATIC_LIB="$alsa_exec_prefix" ALSA_CFLAGS="-I$alsa_exec_prefix/include" fi @@ -61,7 +61,7 @@ if test x"$enable_alsa" != "xno"; then if test x$ALSA_STATIC_LIB != x; then ALSA_STATIC_LIB="$ALSA_STATIC_LIB/lib/libasound.a" else - ALSA_STATIC_LIB="/usr/lib/libasound.a" + ALSA_STATIC_LIB="/usr/$XINE_LIBNAME/libasound.a" fi ALSA_CFLAGS="$ALSA_CFLAGS" |