diff options
| author | Darren Salt <devspam@moreofthesa.me.uk> | 2014-02-26 15:28:24 +0000 |
|---|---|---|
| committer | Darren Salt <devspam@moreofthesa.me.uk> | 2014-02-26 15:28:24 +0000 |
| commit | 3f721ef66e89b8e091dab0af10bb674517aa731c (patch) | |
| tree | 405e1454bf54aa2a727c8c39a45b320d6bdf0934 | |
| parent | cf7abba9c6c6fb0fda0464986228b10ea5e279ec (diff) | |
| download | xine-lib-3f721ef66e89b8e091dab0af10bb674517aa731c.tar.gz xine-lib-3f721ef66e89b8e091dab0af10bb674517aa731c.tar.bz2 | |
dvdnav-config has gone away.
| -rw-r--r-- | m4/input.m4 | 9 | ||||
| -rw-r--r-- | src/dxr3/Makefile.am | 4 | ||||
| -rw-r--r-- | src/input/Makefile.am | 4 | ||||
| -rw-r--r-- | src/spu_dec/Makefile.am | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/m4/input.m4 b/m4/input.m4 index 93d387935..0e54a79e0 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -129,10 +129,11 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ dnl XXX: This could be cleaned up so that code does not have to ifdef so much XINE_ARG_WITH([external-dvdnav], [Use external dvdnav library (not recommended)]) if test x"$with_external_dvdnav" != x"no"; then - ACX_PACKAGE_CHECK([DVDNAV], [0.1.9], [dvdnav-config], - [AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])], - [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) - AC_CHECK_LIB([dvdread], [navRead_DSI], [DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread"], []) + PKG_CHECK_MODULES([DVDREAD], [dvdread], + [PKG_CHECK_MODULES([DVDNAV], [dvdnav], + [AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])], + [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])])], + [AC_MSG_RESULT([*** no usable version of libdvdread found, using internal libdvdnav ***])]) else AC_MSG_RESULT([Using included DVDNAV support]) fi diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index b904c899a..b6b813033 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -33,8 +33,8 @@ xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) if WITH_EXTERNAL_DVDNAV xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c -xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(DVDNAV_LIBS) -xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) +xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(DVDNAV_LIBS) $(DVDREAD_LIBS) +xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) $(DVDREAD_CFLAGS) else xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 3752d4c9b..4ad2af3cf 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -50,8 +50,8 @@ in_smb = xineplug_inp_smb.la endif if WITH_EXTERNAL_DVDNAV -DVD_CFLAGS = $(DVDNAV_CFLAGS) -link_dvdnav = $(DVDNAV_LIBS) +DVD_CFLAGS = $(DVDNAV_CFLAGS) $(DVDREAD_CFLAGS) +link_dvdnav = $(DVDNAV_LIBS) $(DVDREAD_LIBS) else DVD_CFLAGS = -I$(top_srcdir)/src/input/libdvdnav link_dvdnav = libdvdnav/libdvdnav.la diff --git a/src/spu_dec/Makefile.am b/src/spu_dec/Makefile.am index 85aedf9e9..355a8a607 100644 --- a/src/spu_dec/Makefile.am +++ b/src/spu_dec/Makefile.am @@ -21,7 +21,7 @@ xineplug_decode_spucmml_la_SOURCES = cmml_decoder.c xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) if WITH_EXTERNAL_DVDNAV -external_dvdnav_libs = $(DVDNAV_LIBS) +external_dvdnav_libs = $(DVDNAV_LIBS) $(DVDREAD_LIBS) internal_dvdnav_sources = else external_dvdnav_libs = @@ -30,7 +30,7 @@ endif xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spudec.c spudec.h spu_decoder.c xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(external_dvdnav_libs) $(PTHREAD_LIBS) $(LTLIBINTL) -xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) -I$(top_srcdir)/src/input/libdvdnav +xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) $(DVDREAD_CFLAGS) -I$(top_srcdir)/src/input/libdvdnav xineplug_decode_spudvb_la_SOURCES = spudvb_decoder.c xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) |