summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2003-04-10 10:46:32 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2003-04-10 10:46:32 +0000
commit4bd6b343e480844ef466ac4d97bf6cb8b834dea9 (patch)
tree515746f37ef111bafd7001b16ba2861674dc8e51
parent7b86839cc8a60a6a9b5be72c93b8d20abcc73130 (diff)
downloadxine-lib-4bd6b343e480844ef466ac4d97bf6cb8b834dea9.tar.gz
xine-lib-4bd6b343e480844ef466ac4d97bf6cb8b834dea9.tar.bz2
Trying to fix:
[ 713897 ] xine-lib-1-beta9 fails to compile under sparc-sun-solaris2.9 On a Solaris system with the mediaLib library installed, but without mediaLib headers xine-lib compilation fails. Extend the mediaLib test, verify the presence of the mediaLib header files. CVS patchset: 4584 CVS date: 2003/04/10 10:46:32
-rw-r--r--configure.ac11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index e0ac5876f..ee7fff4fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,10 @@ if test x$enable_mlib = xyes; then
fi
AC_CHECK_LIB(mlib, mlib_VideoAddBlock_U8_S16,
- [ LIBS="$LIBS -L$mlibhome/lib -lmlib"
+ [ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$mlibhome/include"
+ AC_CHECK_HEADER(mlib_video.h,
+ [ LIBS="$LIBS -L$mlibhome/lib -lmlib"
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"
@@ -254,8 +257,10 @@ if test x$enable_mlib = xyes; then
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])
- ac_have_mlib=yes],
- , -L/opt/SUNWmlib/lib)
+ ac_have_mlib=yes
+ ],)
+ CPPFLAGS="$saved_CPPFLAGS"
+ ], , -L$mlibhome/lib)
AM_CONDITIONAL(HAVE_MLIB, test x$ac_have_mlib = "xyes")
fi
AC_SUBST(MLIB_CFLAGS)