diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-18 00:28:21 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-18 00:28:21 +0100 |
| commit | 67e50b140e5cebdb516d65b15e5ea0fc2faefc5a (patch) | |
| tree | 3fb37b3431f6be870eacb192ef9b4cbb49dce71c | |
| parent | eed24f925552d30861d132fa26278b2fa2d0c4dd (diff) | |
| download | xine-lib-67e50b140e5cebdb516d65b15e5ea0fc2faefc5a.tar.gz xine-lib-67e50b140e5cebdb516d65b15e5ea0fc2faefc5a.tar.bz2 | |
Cope with library paths for XvMC and XxMC (and Xv, just in case) being null.
I was seeing '-L -lxvmc', which was resulting in linkage failures
(unresolved symbols) at configure time.
| -rw-r--r-- | m4/video_out.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/video_out.m4 b/m4/video_out.m4 index a0ab163fa..4a0a37787 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -406,7 +406,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ if test x"$xv_try_path" != x"" && test -f "$xv_try_path/$xv_lib"; then case $xv_lib in *.$acl_cv_libext) have_xv_static=yes xv_try_libs="$xv_try_path/$xv_lib" ;; - *.$acl_cv_shlibext) have_xv_static=no xv_try_libs="-L$xv_try_path -lXv" ;; + *.$acl_cv_shlibext) have_xv_static=no xv_try_libs="${xv_try_path:+-L}$xv_try_path -lXv" ;; esac ac_save_LIBS="$LIBS" LIBS="$xv_try_libs $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[XvShmCreateImage()]])], [have_xv=yes], []) @@ -454,7 +454,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ ac_save_LIBS="$LIBS" dnl Check for xxmc - XXMC_LIBS="-L$with_xxmc_path -l$with_xxmc_lib" + XXMC_LIBS="${with_xxmc_path:+-L}$with_xxmc_path -l$with_xxmc_lib" AC_SUBST(XXMC_LIBS) AC_MSG_CHECKING([whether to enable the xxmc plugin with VLD extensions]) AC_MSG_RESULT([]) @@ -479,7 +479,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ fi dnl Check for xvmc - XVMC_LIBS="-L$with_xvmc_path -l$with_xvmc_lib" + XVMC_LIBS="${with_xvmc_path:+-L}$with_xvmc_path -l$with_xvmc_lib" AC_SUBST(XVMC_LIBS) AC_MSG_CHECKING([whether to enable the xvmc plugin]) AC_MSG_RESULT([]) |