diff options
| -rw-r--r-- | configure.in | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/configure.in b/configure.in index fe325de14..573066656 100644 --- a/configure.in +++ b/configure.in @@ -126,28 +126,39 @@ AC_SUBST(DYNAMIC_LD_LIBS) dnl dnl mpeg2lib stuff dnl -AC_SUBST(LIBMPEG2_CFLAGS) AC_SUBST(LIBMPEG2_CONFIG_OBJS) +AC_SUBST(LIBMPEG2_CFLAGS) AC_SUBST(LIBA52_CFLAGS) +AC_SUBST(LIBFFMPEG_CFLAGS) LIBMPEG2_CFLAGS="" dnl default include path removed, no more needed. LIBA52_CFLAGS="" +LIBFFMPEG_CFLAGS="" if test x$enable_mlib = x; then AC_ARG_ENABLE(mlib, - [ --disable-mlib make a version not using mediaLib], - enable_mlib=no, enable_mlib=yes) + [ --disable-mlib make a version not using mediaLib], + enable_mlib=no, enable_mlib=yes) fi if test x$enable_mlib = xyes; then - AC_CHECK_LIB(mlib, mlib_VideoAddBlock_U8_S16, - [ LIBS="$LIBS -L/opt/SUNWmlib/lib -lmlib" + if test x"$MLIBHOME" = x; then + mlibhome=/opt/SUNWmlib + else + mlibhome="$MLIBHOME" + fi + + AC_CHECK_LIB(mlib, mlib_VideoAddBlock_U8_S16, + [ LIBS="$LIBS -L$mlibhome/lib -lmlib" LIBMPEG2_CONFIG_OBJS="$LIBMPEG2_CONFIG_OBJS idct_mlib.lo motion_comp_mlib.lo" - LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -I/opt/SUNWmlib/include" - LIBA52_CFLAGS="$LIBA52_CFLAGS -I/opt/SUNWmlib/include" + LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -I$mlibhome/include" + LIBA52_CFLAGS="$LIBA52_CFLAGS -I$mlibhome/include" + LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS -I$mlibhome/include" AC_DEFINE(HAVE_MLIB) AC_DEFINE(LIBMPEG2_MLIB) - AC_DEFINE(LIBA52_MLIB)], + AC_DEFINE(LIBA52_MLIB) + ac_have_mlib=yes], , -L/opt/SUNWmlib/lib) + AM_CONDITIONAL(HAVE_MLIB, test x$ac_have_mlib = "xyes") fi @@ -480,7 +491,8 @@ case $host in cpu_cflags="-mcpu=v8 -mtune=supersparc" ;; sun4u) - cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc" + #cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc" + cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;; esac GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions" |