summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin KAY <komadori@users.sourceforge.net>2003-02-19 21:21:49 +0000
committerRobin KAY <komadori@users.sourceforge.net>2003-02-19 21:21:49 +0000
commit7f12bd3aba90ea334c924f8d5456860e50c498ab (patch)
treefb46d45e1eb8732bf0c46ce8d74a3d0a8ba68ae0
parent3b9d53a7edbebb99ca7430a5ab392eac343a416a (diff)
downloadxine-lib-7f12bd3aba90ea334c924f8d5456860e50c498ab.tar.gz
xine-lib-7f12bd3aba90ea334c924f8d5456860e50c498ab.tar.bz2
Fix missing mediaLib include path
CVS patchset: 4202 CVS date: 2003/02/19 21:21:49
-rw-r--r--configure.ac6
-rw-r--r--src/video_out/Makefile.am4
2 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index b7519bcd0..c3630089c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ AC_ARG_ENABLE(altivec,
enable_altivec=yes)
AC_ARG_ENABLE(vis,
- [ --disable-vis use assembly codes for Sun UltraSPARC cpus],
+ [ --disable-vis use assembly codes for Sun UltraSPARC cpus],
enable_vis=no,
enable_vis=yes)
@@ -241,7 +241,8 @@ if test x$enable_mlib = xyes; then
LIBMPEG2_CONFIG_OBJS="$LIBMPEG2_CONFIG_OBJS idct_mlib.lo motion_comp_mlib.lo"
LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -I$mlibhome/include"
LIBA52_CFLAGS="$LIBA52_CFLAGS -I$mlibhome/include"
- LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS -I$mlibhome/include"
+ LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS -I$mlibhome/include"
+ MLIB_CFLAGS="-I$mlibhome/include"
AC_DEFINE(HAVE_MLIB,1,[Define this if you have mlib installed])
AC_DEFINE(LIBMPEG2_MLIB,1,[Define this if you have mlib installed])
AC_DEFINE(LIBA52_MLIB,1,[Define this if you have mlib installed])
@@ -249,6 +250,7 @@ if test x$enable_mlib = xyes; then
, -L/opt/SUNWmlib/lib)
AM_CONDITIONAL(HAVE_MLIB, test x$ac_have_mlib = "xyes")
fi
+AC_SUBST(MLIB_CFLAGS)
dnl ---------------------------------------------
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 979d86a0b..dca42d6ca 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -7,11 +7,11 @@ VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
AM_CFLAGS = $(X_CFLAGS) \
-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
- $(AALIB_CFLAGS)
+ $(AALIB_CFLAGS) $(MLIB_CFLAGS)
DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) \
-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
- $(AALIB_CFLAGS)
+ $(AALIB_CFLAGS) $(MLIB_CFLAGS)
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic