# HG changeset patch # User nicodvb # Date 1213446801 0 # Node ID 04e18408715195d4565a7cd59188dca3b3a581c9 # Parent 3e3119415275017d4d375cdd794873f9b3589b05 now autotools use dvdread-config, too. Based on a patch by Dan Nicholson diff -r 3e3119415275 -r 04e184087151 Makefile.am --- a/Makefile.am Wed Jun 11 18:06:43 2008 +0000 +++ b/Makefile.am Sat Jun 14 12:33:21 2008 +0000 @@ -4,7 +4,7 @@ includedir = ${prefix}/include/dvdnav -AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \ +AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \ -I$(top_srcdir)/src/vm EXTRA_DIST = README.MAP FELLOWSHIP.map @@ -16,8 +16,8 @@ searching.c settings.c remap.c \ dvdnav_internal.h read_cache.h remap.h -libdvdnav_la_LIBADD = $(THREAD_LIBS) \ - $(top_builddir)/src/vm/libdvdvm.la -ldvdread +libdvdnav_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS) \ + $(top_builddir)/src/vm/libdvdvm.la libdvdnav_la_LDFLAGS = \ -version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \ diff -r 3e3119415275 -r 04e184087151 vm/Makefile.am --- a/vm/Makefile.am Wed Jun 11 18:06:43 2008 +0000 +++ b/vm/Makefile.am Sat Jun 14 12:33:21 2008 +0000 @@ -2,7 +2,7 @@ includedir = ${prefix}/include/dvdnav -AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \ +AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \ -I$(top_srcdir)/src noinst_LTLIBRARIES = libdvdvm.la