On Sun, Jun 8, 2008 at 11:45 AM, Dan Nicholson <[EMAIL PROTECTED]> wrote:
> On Sun, Jun 8, 2008 at 11:29 AM, Nico Sabbi <[EMAIL PROTECTED]> wrote:
>>
>> Dan, why DVDREAD_LIBS isn't being used (or expanded) in src/Makefile.am ?
>> That's why I hate so savagely autotools :(
>
> I understand. The patch looks sane. Did you rebuild the autotools with
> autoreconf? I can't see any reason why it wouldn't be substituted.
Here's a full patch which works for me.
--
Dan
From 8b26d5c113fea01298c2a74e4af2583bbf6eb4c1 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <[EMAIL PROTECTED]>
Date: Sun, 8 Jun 2008 16:44:17 -0700
Subject: [PATCH] Use external libdvdread with autotools, too
---
configure.ac | 19 +++++++++++++++++++
examples/Makefile.am | 5 ++---
src/Makefile.am | 4 ++--
src/vm/Makefile.am | 4 ++--
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 941c437..970827b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,25 @@ case $host in
esac
dnl ---------------------------------------------
+dnl libdvdread
+dnl ---------------------------------------------
+AC_ARG_WITH([dvdread-config],
+ [AS_HELP_STRING([--with-dvdread-config=PROG],
+ [dvdread-config program to use @<:@default=from PATH@:>@])],
+ [DVDREAD_CONFIG="$withval"],
+ [dnl User didn't specify program, search PATH
+ AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no])
+ test "x$DVDREAD_CONFIG" = xno && \
+ AC_MSG_ERROR([dvdread-config required to link with libdvdread])
+ ])
+DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \
+ AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG])
+DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \
+ AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG])
+AC_SUBST([DVDREAD_CFLAGS])
+AC_SUBST([DVDREAD_LIBS])
+
+dnl ---------------------------------------------
dnl cflags
dnl ---------------------------------------------
dnl Common cflags for all platforms
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8967499..c4540f5 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,14 +1,13 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src
+AM_CPPFLAGS = -DDVDNAV_COMPILE $(DVDREAD_CFLAGS) -I$(top_srcdir)/src
DVDNAV_LIB = $(top_builddir)/src/libdvdnav.la
noinst_PROGRAMS = menus
menus_SOURCES = menus.c
-menus_LDFLAGS = -L$(top_srcdir)/src/ -ldvdread
-menus_LDADD = $(DVDNAV_LIB)
+menus_LDADD = $(DVDNAV_LIB) $(DVDREAD_LIBS)
$(DVDNAV_LIB):
@cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e574aa..3294718 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = vm
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
@@ -17,7 +17,7 @@ libdvdnav_la_SOURCES = dvdnav.c \
dvdnav_internal.h read_cache.h remap.h
libdvdnav_la_LIBADD = $(THREAD_LIBS) \
- $(top_builddir)/src/vm/libdvdvm.la -ldvdread
+ $(top_builddir)/src/vm/libdvdvm.la $(DVDREAD_LIBS)
libdvdnav_la_LDFLAGS = \
-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index ad80dd8..9a8f313 100644
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -2,14 +2,14 @@ include $(top_srcdir)/misc/Makefile.common
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
libdvdvm_la_SOURCES = decoder.c vm.c vmcmd.c
-libdvdvm_la_LDFLAGS = $(THREAD_LIBS)
+libdvdvm_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS)
include_HEADERS =
--
1.5.3.2
_______________________________________________
DVDnav-discuss mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss
