Commit a07c996f authored by brendan's avatar brendan

Handle --without-theora option. Ideally this would be controlled by

the caller (who may or may not want to allow this option), but I don't
know how to do that while AC_ARG_WITH(theora...) is inside this
macro.

svn path=/icecast/trunk/m4/; revision=7101
parent 8d52fab4
...@@ -18,52 +18,58 @@ AC_ARG_WITH(theora, ...@@ -18,52 +18,58 @@ AC_ARG_WITH(theora,
theora_prefix="$withval", theora_prefix="$withval",
theora_prefix="$THEORA_PREFIX" theora_prefix="$THEORA_PREFIX"
) )
if test "x$theora_prefix" = "x"; then
if test "x$with_theora" = "xno"
then
AC_MSG_RESULT([Theora support disabled by request])
else
if test "x$theora_prefix" = "x"; then
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
theora_prefix="/usr/local" theora_prefix="/usr/local"
else else
theora_prefix="$prefix" theora_prefix="$prefix"
fi fi
fi fi
THEORA_CFLAGS="$OGG_CFLAGS" THEORA_CFLAGS="$OGG_CFLAGS"
THEORA_LDFLAGS="$OGG_LDFLAGS" THEORA_LDFLAGS="$OGG_LDFLAGS"
if test "x$theora_prefix" != "x$ogg_prefix"; then if test "x$theora_prefix" != "x$ogg_prefix"; then
XIPH_GCC_WARNING(-I"$theora_prefix/include",, XIPH_GCC_WARNING(-I"$theora_prefix/include",,
[THEORA_CFLAGS="$THEORA_CFLAGS -I$theora_prefix/include" [THEORA_CFLAGS="$THEORA_CFLAGS -I$theora_prefix/include"
THEORA_LDFLAGS="-L$theora_prefix/lib $THEORA_LDFLAGS" THEORA_LDFLAGS="-L$theora_prefix/lib $THEORA_LDFLAGS"
]) ])
fi fi
THEORA_LIBS="-ltheora" THEORA_LIBS="-ltheora"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
ac_save_LDFLAGS="$LDFLAGS" ac_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $THEORA_LDFLAGS" LDFLAGS="$LDFLAGS $THEORA_LDFLAGS"
LIBS="$LIBS $THEORA_LIBS" LIBS="$LIBS $THEORA_LIBS"
xt_have_theora="yes" xt_have_theora="yes"
AC_MSG_CHECKING([for libtheora]) AC_MSG_CHECKING([for libtheora])
AC_TRY_LINK_FUNC(ogg_stream_init, [AC_MSG_RESULT([ok])], AC_TRY_LINK_FUNC(ogg_stream_init, [AC_MSG_RESULT([ok])],
[LIBS="$LIBS $OGG_LIBS" [LIBS="$LIBS $OGG_LIBS"
AC_TRY_LINK_FUNC(ogg_stream_init, AC_TRY_LINK_FUNC(ogg_stream_init,
[THEORA_LIBS="$THEORA_LIBS $OGG_LIBS"], [THEORA_LIBS="$THEORA_LIBS $OGG_LIBS"],
[xt_have_theora="no"]) [xt_have_theora="no"])
]) ])
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
LDFLAGS="$ac_save_LDFLAGS" LDFLAGS="$ac_save_LDFLAGS"
if test "x$xt_have_theora" = "xyes" if test "x$xt_have_theora" = "xyes"
then then
AC_MSG_RESULT([ok]) AC_MSG_RESULT([ok])
AC_DEFINE([HAVE_THEORA],[1],[Define if Theora support is available]) AC_DEFINE([HAVE_THEORA],[1],[Define if Theora support is available])
else else
ifelse([$2], , AC_MSG_ERROR([Unable to link to libtheora]), [$2]) ifelse([$2], , AC_MSG_ERROR([Unable to link to libtheora]), [$2])
THEORA_CFLAGS="" THEORA_CFLAGS=""
THEORA_LDFLAGS="" THEORA_LDFLAGS=""
THEORA_LIBS="" THEORA_LIBS=""
fi
AC_SUBST(THEORA_CFLAGS)
AC_SUBST(THEORA_LDFLAGS)
AC_SUBST(THEORA_LIBS)
fi fi
AC_SUBST(THEORA_CFLAGS)
AC_SUBST(THEORA_LDFLAGS)
AC_SUBST(THEORA_LIBS)
]) ])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment