summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-04-30 16:45:34 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-04-30 16:45:34 +0000
commite9b66d33fb8ce2a1c76fa7f08c69856851eb2b16 (patch)
tree7f0a69f77e69db31b105ef65c7cf3b6ee696a21e
parent4f750dbdf8fa708c09a32a8ec266b6a20c360e7e (diff)
downloadxine-lib-e9b66d33fb8ce2a1c76fa7f08c69856851eb2b16.tar.gz
xine-lib-e9b66d33fb8ce2a1c76fa7f08c69856851eb2b16.tar.bz2
when compiling with a standalone libdvdnav, we need to have the DVDNAV_CFLAGS
globally, since the spu decoder API header, which is included almost everywhere via xine_internal.h needs nav_types.h this is meant only a temporary measure, I will come up with a better solution later, but now it is needed for consistency CVS patchset: 4722 CVS date: 2003/04/30 16:45:34
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 8449a3b28..173b1d7c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -802,10 +802,13 @@ AC_ARG_WITH(external-dvdnav,[ --with-external-dvdnav Use external dvdnav libra
if test x"$external_dvdnav" = "xyes"; then
AM_PATH_DVDNAV(0.1.9,
- AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]),
+ [
+ CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
+ 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 ***])])
else
- AC_MSG_RESULT([Use included DVDNAV/DVDREAD support])
+ AC_MSG_RESULT([Use included DVDNAV support])
fi
AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"])