diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2004-12-12 03:04:58 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2004-12-12 03:04:58 +0000 |
| commit | dfc946c20535ded2287ab03fb009cdbfb094af2b (patch) | |
| tree | 20f144330d7ff6267ac948212823886e0b8c94cd /m4 | |
| parent | fa5d837d30e3f67347b0fd838db068e74ef18b35 (diff) | |
| download | xine-lib-dfc946c20535ded2287ab03fb009cdbfb094af2b.tar.gz xine-lib-dfc946c20535ded2287ab03fb009cdbfb094af2b.tar.bz2 | |
Moved xv checks and tests to m4/xv.m4.
Add --enable-shared-xv to force use of libXv.so over libXv.a. The
default behavior is to use libXv.a if configure option is not used.
CVS patchset: 7227
CVS date: 2004/12/12 03:04:58
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/xv.m4 | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/m4/xv.m4 b/m4/xv.m4 new file mode 100644 index 000000000..bca645ff6 --- /dev/null +++ b/m4/xv.m4 @@ -0,0 +1,73 @@ +# AC_FIND_LIBXV_IMPL (LIB) +# ------------------------- +# +AC_DEFUN([AC_PATH_LIBXV_IMPL], +[ + AC_MSG_CHECKING([for $1]) + if test -f "$xv_path/$1"; then + AC_MSG_RESULT([found $1 in $xv_path]) + xv_lib="$1" + else + AC_MSG_RESULT([$1 not found in $xv_path]) + fi +]) + +AC_DEFUN([AC_TEST_LIBXV], +[ + dnl ----------------------------------------------- + dnl Testing installed Xv library + dnl ----------------------------------------------- + AC_CHECK_LIB(Xv, XvShmCreateImage, + [ + AC_DEFINE(HAVE_XV, + 1, + [Define this if you have libXv installed]) + + ac_have_xv="yes" + if test x$xv_lib = "xlibXv.a" ; then + + AC_DEFINE(HAVE_XV_STATIC, + 1, + [Define this if you have libXv.a]) + + fi], + , + [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) + + AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") + + dnl ----------------------------------------------- + dnl xine_check use Xv functions API. + dnl ----------------------------------------------- + if test x$ac_have_xv = "xyes"; then + EXTRA_X_LIBS="-L$xv_path $XV_LIB -lXext" + EXTRA_X_CFLAGS="" + fi + AC_SUBST(XV_LIB) + AC_SUBST(EXTRA_X_LIBS) + AC_SUBST(EXTRA_X_CFLAGS) +]) + +# AC_PATH_LIBXV +# ------------------------- +# +AC_DEFUN([AC_PATH_LIBXV], +[ + # Ensure that AC_PATH_XTRA is executed before this + AC_REQUIRE([AC_PATH_XTRA]) + + # Set xv_path if its not done already + if test -z $xv_path; then + xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'` + fi + + if test "x$xv_prefer_shared" = "xyes"; then + AC_PATH_LIBXV_IMPL([libXv.so]) + else + AC_PATH_LIBXV_IMPL([libXv.a]) + fi + + if ! test -z $xv_lib; then + AC_TEST_LIBXV + fi +]) |