diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-08-05 22:51:53 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-08-05 22:51:53 +0100 |
| commit | c579d6f6fb0fd0075faf02a80be1a24f7f75071a (patch) | |
| tree | 9ecca7232b48a5e3421d48d10c9d9861f95c5b36 /m4 | |
| parent | c2c388cfc3258d237493df7e4efdfe2562abe78b (diff) | |
| parent | 08c9d1d6bce967a909bb55a967bf694ce29b4f48 (diff) | |
| download | xine-lib-c579d6f6fb0fd0075faf02a80be1a24f7f75071a.tar.gz xine-lib-c579d6f6fb0fd0075faf02a80be1a24f7f75071a.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmusepack/xine_musepack_decoder.c => src/audio_dec/xine_musepack_decoder.c
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 8 | ||||
| -rw-r--r-- | m4/pthreads.m4 | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 9150adda0..be32e7917 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -301,9 +301,11 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled, internal: use external copy)])]) if test x"$enable_musepack" != x"no"; then if test x"$enable_musepack" != x"internal"; then - AC_CHECK_LIB([mpcdec], [mpc_decoder_decode], - [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [have_external_libmpcdec=yes], [have_external_libmpcdec=no])], - [have_external_libmpcdec=no]) + AC_CHECK_LIB([mpcdec], [mpc_demux_decode], + [AC_CHECK_HEADERS([mpc/mpcdec.h], [have_external_libmpcdec=yes], [have_external_libmpcdec=no])], + [AC_CHECK_LIB([mpcdec], [mpc_decoder_decode], + [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [have_external_libmpcdec=yes], [have_external_libmpcdec=no])], + [have_external_libmpcdec=no])]) if test x"$have_external_libmpcdec" != x"yes"; then AC_MSG_RESULT([*** no usable version of libmpcdec found, using internal copy ***]) else diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index d1d1c0a62..6cbed9255 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -18,6 +18,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ dnl if PTHREAD_* are not set, default to -pthread (GCC) if test "${PTHREAD_CFLAGS-unset}" = "unset"; then case $host in + *-mingw*) PTHREAD_CFLAGS="" ;; *-hpux11*) PTHREAD_CFLAGS="" ;; *-darwin*) PTHREAD_CFLAGS="" ;; *-solaris*|*-linux-gnu) @@ -29,6 +30,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ fi if test "${PTHREAD_LIBS-unset}" = "unset"; then case $host in + *-mingw*) PTHREAD_LIBS="-lpthreadGC2" ;; *-hpux11*) PTHREAD_LIBS="-lpthread" ;; *-darwin*) PTHREAD_LIBS="" ;; *-solaris*) |